aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-27 18:03:19 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-27 18:03:19 +0100
commitabea06b4d569016d7f83429c90635edb451c9b3b (patch)
tree2d67224cca878b9859de4556ff2e196310e9b23b /prosody
parentfe7921945ccf504691a774adf1f94465e975b836 (diff)
parentbcc1074dd55582c565d0fe6349f3eb686d2f6fab (diff)
downloadprosody-abea06b4d569016d7f83429c90635edb451c9b3b.tar.gz
prosody-abea06b4d569016d7f83429c90635edb451c9b3b.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions