aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-13 12:07:46 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-13 12:07:46 +0100
commitf5b07ef8c17c9042c532b5450cbc1301cd31e872 (patch)
treed1f0f6d477f68bd8bbb9fef3dff9b3186ba8f881 /prosody
parent4191089ebd038a29b31d96625093ef68635bf9c1 (diff)
parent9698b497ba18169defb48e217d9182fd01c84533 (diff)
downloadprosody-f5b07ef8c17c9042c532b5450cbc1301cd31e872.tar.gz
prosody-f5b07ef8c17c9042c532b5450cbc1301cd31e872.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions