aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-04-15 18:08:16 +0100
committerMatthew Wild <mwild1@gmail.com>2014-04-15 18:08:16 +0100
commit696099ca4cdf221f8c81d19aa25bb3457fdea7b7 (patch)
tree5a47eb6c6c4a37be242c5028e6c4bc759f84e112 /prosody
parent1c3053a6ebcb9fc16051becc296f61b82e14e100 (diff)
parent75c7b9704a05611583a56b5f0be58cb1526c1bdf (diff)
downloadprosody-696099ca4cdf221f8c81d19aa25bb3457fdea7b7.tar.gz
prosody-696099ca4cdf221f8c81d19aa25bb3457fdea7b7.zip
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions