diff options
author | Kim Alvefur <zash@zash.se> | 2014-11-20 15:00:52 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-11-20 15:00:52 +0100 |
commit | b32f290795cd6fa60cca8433399eec5fe561bbbc (patch) | |
tree | d923b1c2b876061a9845a8e92e394815218a487a /prosody | |
parent | 727c5935a8fefa27883a92ffc50e32c3b3d29e17 (diff) | |
parent | a7d88ea2334bf18857b50cf7032ec3a3a79762fa (diff) | |
download | prosody-b32f290795cd6fa60cca8433399eec5fe561bbbc.tar.gz prosody-b32f290795cd6fa60cca8433399eec5fe561bbbc.zip |
Merge 0.9->0.10
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions