aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-12-03 15:43:02 +0000
committerMatthew Wild <mwild1@gmail.com>2015-12-03 15:43:02 +0000
commitacb5641bfb3cf7db1ce6a45869cfa61dc2a64b27 (patch)
tree1d8957cc4cb07df8aa0b11e80e6d612e935a3e32 /core
parent2b9a7ef7b48519a64f64268f4b4169c601175e93 (diff)
parent8b1e8e2e6ba562f0e59d36ea190ed50eef749af8 (diff)
downloadprosody-acb5641bfb3cf7db1ce6a45869cfa61dc2a64b27.tar.gz
prosody-acb5641bfb3cf7db1ce6a45869cfa61dc2a64b27.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions