diff options
author | Kim Alvefur <zash@zash.se> | 2015-09-24 20:15:19 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-09-24 20:15:19 +0200 |
commit | 8a539ac1ee9de45326aabefaa124bc7792134521 (patch) | |
tree | 12d7f0ee52b21fe124cc849278902ba715a35b32 /core | |
parent | 5dcb0569722d6feea8942fd5acc8af7805060f8b (diff) | |
parent | fabb7c056162683bf2da290348bf3c1efaa9e672 (diff) | |
download | prosody-8a539ac1ee9de45326aabefaa124bc7792134521.tar.gz prosody-8a539ac1ee9de45326aabefaa124bc7792134521.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions