aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-22 14:49:05 +0100
committerKim Alvefur <zash@zash.se>2016-01-22 14:49:05 +0100
commit9cfa6a9d4994b61842b2478df4470922fb3a2546 (patch)
tree3f7098f07d3ae232ef8a765d0bedcc4d1cda8df2 /core
parent19b9ea3838a29c06f1bbb6ddec5645187e675dac (diff)
parent48feb105c43a32c3e956ade72946551efed82b93 (diff)
downloadprosody-9cfa6a9d4994b61842b2478df4470922fb3a2546.tar.gz
prosody-9cfa6a9d4994b61842b2478df4470922fb3a2546.zip
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions