aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-11-26 00:19:31 +0000
committerMatthew Wild <mwild1@gmail.com>2015-11-26 00:19:31 +0000
commitab8006e6152db2531cfc65fbfa4de95efa570d6d (patch)
tree1584719c9dc1939806c4e9f35c3cc4bd7e368320 /core
parent237847b4d5a439a19d128f14f898f224a97bdf6e (diff)
parent451180d8a42fd3869be9b7002142467147da3203 (diff)
downloadprosody-ab8006e6152db2531cfc65fbfa4de95efa570d6d.tar.gz
prosody-ab8006e6152db2531cfc65fbfa4de95efa570d6d.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions