diff options
author | Kim Alvefur <zash@zash.se> | 2013-11-24 14:24:21 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-11-24 14:24:21 +0100 |
commit | 0aba6244bcd6d0b56be65229719fbd85a20e74b6 (patch) | |
tree | 1c72c5ce0e048bf184b958bb0d6419717b2865bc /prosody | |
parent | cb77e4d2580284e28a6c4562b613e5c9904a120e (diff) | |
parent | 7e594b0b3c957966220ffa435c8743d1534ea28f (diff) | |
download | prosody-0aba6244bcd6d0b56be65229719fbd85a20e74b6.tar.gz prosody-0aba6244bcd6d0b56be65229719fbd85a20e74b6.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions