aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-01-04 09:14:57 +0000
committerMatthew Wild <mwild1@gmail.com>2016-01-04 09:14:57 +0000
commit3d0f3a9db092d06daa782135077acfaf9b40b69c (patch)
treeab26708d42996a414b963a224970995aed5179cc /core
parent6a39c2064ccd3956857494208013e95515c3d6fd (diff)
parent3937d883586e89b5dd6c0da332bf290158a6ecb1 (diff)
downloadprosody-3d0f3a9db092d06daa782135077acfaf9b40b69c.tar.gz
prosody-3d0f3a9db092d06daa782135077acfaf9b40b69c.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions