aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-09 02:36:09 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-09 02:36:09 +0100
commit08553fc31ba154e7cabbd2c0540a12248a1924b4 (patch)
tree42e54661043d57357f9a0f163fc92702143d3252 /prosody
parent58e466f88e148ca443eb5bb4a5940feb300ce2fc (diff)
parent88f2090c5b3ace2f2f07de9735fa60307a19d010 (diff)
downloadprosody-08553fc31ba154e7cabbd2c0540a12248a1924b4.tar.gz
prosody-08553fc31ba154e7cabbd2c0540a12248a1924b4.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions