aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-09-25 16:51:42 +0100
committerMatthew Wild <mwild1@gmail.com>2015-09-25 16:51:42 +0100
commit99fd12af8f8d5532cc20726f94894265cabd128f (patch)
treeeea2862632b81d8c25ac5278d21adb835531d35c /prosody
parent0da792c4565b53e9d81fa0944abb9a908e078e55 (diff)
parent1ec2105627d40bd9b9744657fabbb58af22c2a76 (diff)
downloadprosody-99fd12af8f8d5532cc20726f94894265cabd128f.tar.gz
prosody-99fd12af8f8d5532cc20726f94894265cabd128f.zip
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions