aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-04-27 00:03:14 +0200
committerKim Alvefur <zash@zash.se>2015-04-27 00:03:14 +0200
commit86867275492107937cea9b5887de077679bc751d (patch)
tree505b848be10efd4cdb0528f043078c23750982ef /core
parent43702241ec9a8bf74a23c63b5ee2fd6edd49cbe3 (diff)
parent2dcf1e16965cf7fc6cf2c097dae4f20f3d864792 (diff)
downloadprosody-86867275492107937cea9b5887de077679bc751d.tar.gz
prosody-86867275492107937cea9b5887de077679bc751d.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions