aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-08 17:22:15 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-08 17:22:15 +0100
commit22baeb39fe3c291e7f98977b7fa6af8353d910dd (patch)
treeb63f60f6dff8c647f5952a2a92bb0a1da8d2a94f /prosody
parent4f4ea37379152abaee179a750a24f7019c405583 (diff)
parent0ce5c766ac0a68a167a9fa26b931c56d35ae785b (diff)
downloadprosody-22baeb39fe3c291e7f98977b7fa6af8353d910dd.tar.gz
prosody-22baeb39fe3c291e7f98977b7fa6af8353d910dd.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions