diff options
author | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-11-09 22:56:32 +0100 |
commit | dd417c0f4a850be9280c2589f0a582aa0d7d566d (patch) | |
tree | 3e6fc617741dec52b661ba121b7949d6b284399d /prosody | |
parent | 1407c9f7a72c9e27efb9983554e7579d157aecc6 (diff) | |
parent | 5d077a0c17dbe89c2481cdebd18f4051dd2d10ae (diff) | |
download | prosody-dd417c0f4a850be9280c2589f0a582aa0d7d566d.tar.gz prosody-dd417c0f4a850be9280c2589f0a582aa0d7d566d.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions