diff options
author | Kim Alvefur <zash@zash.se> | 2016-04-05 12:48:36 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-04-05 12:48:36 +0200 |
commit | 69f2c9017677ef6a1bbec03793ee219d16d09f81 (patch) | |
tree | 95b6245c2b66f0d5696ba3cb2d43e61ea3a37357 /core | |
parent | d00290510d93265adb1ca29f17a15a168349c441 (diff) | |
parent | afcc8898695dd49b60998369e55be70d1a266a82 (diff) | |
download | prosody-69f2c9017677ef6a1bbec03793ee219d16d09f81.tar.gz prosody-69f2c9017677ef6a1bbec03793ee219d16d09f81.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions