diff options
author | Kim Alvefur <zash@zash.se> | 2016-03-14 17:38:50 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-03-14 17:38:50 +0100 |
commit | de0076f16c510ebbfaedf17884e6248b42b599ca (patch) | |
tree | b5a38a6a817aa63528bdc225aa207006faf12f5e /core | |
parent | 3ec49d31afc719ec2bec5dee640e41c11f52fe62 (diff) | |
parent | ab4f0cf7c4d64e331789ed11792796bd043fc940 (diff) | |
download | prosody-de0076f16c510ebbfaedf17884e6248b42b599ca.tar.gz prosody-de0076f16c510ebbfaedf17884e6248b42b599ca.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions