aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-18 11:14:16 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-18 11:14:16 +0100
commite8d4802c4d0c57b7c35b1aa0c77f111af1116d4c (patch)
treea3a9a8ff5de3a20a633b079bd5e5e81eaaad39af /core
parent8a95381b4095ec24967d5dc399330be9fa7e11c7 (diff)
parent0dd53a7f8387e0282d1185fc1986c6e5490dad5b (diff)
downloadprosody-e8d4802c4d0c57b7c35b1aa0c77f111af1116d4c.tar.gz
prosody-e8d4802c4d0c57b7c35b1aa0c77f111af1116d4c.zip
Merge 0.9->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions