diff options
author | Kim Alvefur <zash@zash.se> | 2014-08-09 21:48:52 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-08-09 21:48:52 +0200 |
commit | 63d2019bcb00606fa7f10c05e979d36f748edaab (patch) | |
tree | 24154d31350e9324ccd72bdbc2e102bb48fa13cc /core | |
parent | 227ec5a23363231da05d349560e5477421454e29 (diff) | |
parent | a1bd262775c1f8ff911cd7a6e30146d602602675 (diff) | |
download | prosody-63d2019bcb00606fa7f10c05e979d36f748edaab.tar.gz prosody-63d2019bcb00606fa7f10c05e979d36f748edaab.zip |
Merge 0.10->trunk
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions