aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-19 13:30:37 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-19 13:30:37 +0100
commitbc2cf7ee1976a358b1bead2fb047e71576b66d10 (patch)
treefe4b6310322c843b8210c18bbfd48f79a2b91c3f /prosody
parente8d4802c4d0c57b7c35b1aa0c77f111af1116d4c (diff)
parentfb13c42bfd1c42d243d93c00d1a3bfd96f2177d7 (diff)
downloadprosody-bc2cf7ee1976a358b1bead2fb047e71576b66d10.tar.gz
prosody-bc2cf7ee1976a358b1bead2fb047e71576b66d10.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions