diff options
author | Kim Alvefur <zash@zash.se> | 2015-04-26 00:06:44 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-04-26 00:06:44 +0200 |
commit | 71b2b7782e075e596d29ee790879940ed946bfda (patch) | |
tree | 11f81ddc7bcc089676e965ba2b9171c2767911d5 /core | |
parent | b028ed1feed0ca36b0923533df89a184412cdc2c (diff) | |
parent | f458d7b46d85b2eb1bb78306d32f9fd0a5059bf7 (diff) | |
download | prosody-71b2b7782e075e596d29ee790879940ed946bfda.tar.gz prosody-71b2b7782e075e596d29ee790879940ed946bfda.zip |
Merge 0.9->0.10
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions