aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-06-29 10:11:55 +0100
committerMatthew Wild <mwild1@gmail.com>2013-06-29 10:11:55 +0100
commit237fbdb8e53b39063c1df36d94f59695d80c2de2 (patch)
treec8d6f85995dc8549113fd74d2e095725531f60cb /prosody
parent9f3c9da2c265910b4878cf20d61be15bc033354f (diff)
parent701a556a1c92c521c03722c69493c37e33fa765d (diff)
downloadprosody-237fbdb8e53b39063c1df36d94f59695d80c2de2.tar.gz
prosody-237fbdb8e53b39063c1df36d94f59695d80c2de2.zip
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions