aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-13 00:46:29 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-13 00:46:29 +0100
commit4191089ebd038a29b31d96625093ef68635bf9c1 (patch)
treed1f0f6d477f68bd8bbb9fef3dff9b3186ba8f881 /prosody
parent616c7ef5507e3005d41441df03f3096ed4f8216a (diff)
parent0aef21fc95c949fcf2cfaf1a841de9cf04c49f87 (diff)
downloadprosody-4191089ebd038a29b31d96625093ef68635bf9c1.tar.gz
prosody-4191089ebd038a29b31d96625093ef68635bf9c1.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions