aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-01 13:45:05 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-01 13:45:05 +0100
commit37094685f47c050702a6fc2f9cdd9b6b06dccd90 (patch)
tree3e00cd2af58e4602779b13c51761bd86b48ea264 /core
parent81cb2e43802f4b4ea7430cf0f58fcf6358bfc97a (diff)
parent2344ef54376bd25ed6ef7f35470135ff73b56d87 (diff)
downloadprosody-37094685f47c050702a6fc2f9cdd9b6b06dccd90.tar.gz
prosody-37094685f47c050702a6fc2f9cdd9b6b06dccd90.zip
Merge with Florob
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions