diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-05 16:31:34 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-05 16:31:34 +0100 |
commit | d2f663f5daae1b6d720d8ed0e9bf847dde07adb6 (patch) | |
tree | 6815ba825d7158b632e3a9713842575d40d20e9a /prosody | |
parent | ceb159bd90ebeeeb8d17ffde84c4ae799a5079e4 (diff) | |
parent | e70cd52ed93921f41ed4d2fe1cf1f4457700554a (diff) | |
download | prosody-d2f663f5daae1b6d720d8ed0e9bf847dde07adb6.tar.gz prosody-d2f663f5daae1b6d720d8ed0e9bf847dde07adb6.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions