aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-07-09 00:04:30 +0100
committerMatthew Wild <mwild1@gmail.com>2013-07-09 00:04:30 +0100
commitc6f38695b19f39591963331727bf8274e71e3d40 (patch)
treea16ad67f4b3c386fb97dbe164983fe2f51e4b125 /prosody
parent5ad0e8280273c22fef6cd5b7d915e895c3473344 (diff)
parenta8be0a4bbea2985224bd40b077da669373233dfd (diff)
downloadprosody-c6f38695b19f39591963331727bf8274e71e3d40.tar.gz
prosody-c6f38695b19f39591963331727bf8274e71e3d40.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions