aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-08-09 21:48:52 +0200
committerKim Alvefur <zash@zash.se>2014-08-09 21:48:52 +0200
commit8bbf7d4e1f76626a4859167500b5bf287ef3a2c6 (patch)
tree24154d31350e9324ccd72bdbc2e102bb48fa13cc /core
parentedd380b6cd178d2b0eb11b44c659874420393e4c (diff)
parent503aba403d99eeedf2cc8ebb6c7df50e983f538d (diff)
downloadprosody-8bbf7d4e1f76626a4859167500b5bf287ef3a2c6.tar.gz
prosody-8bbf7d4e1f76626a4859167500b5bf287ef3a2c6.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions