aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-07-15 23:35:49 +0100
committerMatthew Wild <mwild1@gmail.com>2013-07-15 23:35:49 +0100
commitfcdcd272b805eece49698cec15ad2e9f94e19e54 (patch)
treea8c9559f1958746651f197d63ba93f9079648c68 /prosody
parent50af5c225d193b689d08a64d2c3ae155b57417b4 (diff)
parent0aa0615b97d02463eeffa9d61b59dc4992680b3c (diff)
downloadprosody-fcdcd272b805eece49698cec15ad2e9f94e19e54.tar.gz
prosody-fcdcd272b805eece49698cec15ad2e9f94e19e54.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions