aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-09-19 12:14:08 +0100
committerMatthew Wild <mwild1@gmail.com>2012-09-19 12:14:08 +0100
commita868b41b589356e9231df919a1771cc99b20d54b (patch)
treecf7a08a965f0bb9816285dcc830a140b62fc0ab1 /prosody
parent8ffa6ad43baaab15a9bf11d51d229312315ac44e (diff)
parent3b96fac7491ce85877b7ee2038ae90b2d501ca6c (diff)
downloadprosody-a868b41b589356e9231df919a1771cc99b20d54b.tar.gz
prosody-a868b41b589356e9231df919a1771cc99b20d54b.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions