aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-08-24 23:16:08 +0100
committerMatthew Wild <mwild1@gmail.com>2013-08-24 23:16:08 +0100
commitdc95231f96b825d9bca6eb228e1a3f4edcac244a (patch)
tree46ee70e977ded44ebeb42ca6007865fd3f5996f3 /core
parent7b4559a4f29dfae40494621bb5c1d587d1c36c91 (diff)
parent65c94b76eefa120d2f28e6c470bb9f9a8f23e7e1 (diff)
downloadprosody-dc95231f96b825d9bca6eb228e1a3f4edcac244a.tar.gz
prosody-dc95231f96b825d9bca6eb228e1a3f4edcac244a.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions