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
commitb5ccfb0d7836918c0a65688df2f52e593304d83c (patch)
treea16ad67f4b3c386fb97dbe164983fe2f51e4b125 /prosody
parent316d5d6e0833d55bb49d8a2f8ba8afd9b6dd2ba5 (diff)
parent98ce25306381896a2502e833f1e218d7c599cc4e (diff)
downloadprosody-b5ccfb0d7836918c0a65688df2f52e593304d83c.tar.gz
prosody-b5ccfb0d7836918c0a65688df2f52e593304d83c.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions