aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-06-29 20:23:11 +0100
committerMatthew Wild <mwild1@gmail.com>2010-06-29 20:23:11 +0100
commit5c26995dfa7270b1c3b2c3f849f2c8d9b51315f9 (patch)
treee4c54190a336609294d3b1bced7bf383dfc1f178 /core
parent5a862cb1afc932a2a72b4f569024dd5aaddcc6b8 (diff)
parent86720e0bef3dc8532e32c4c50824317ec1e7a95a (diff)
downloadprosody-5c26995dfa7270b1c3b2c3f849f2c8d9b51315f9.tar.gz
prosody-5c26995dfa7270b1c3b2c3f849f2c8d9b51315f9.zip
Merge backout
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions