diff options
author | Kim Alvefur <zash@zash.se> | 2014-04-15 20:36:39 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-04-15 20:36:39 +0200 |
commit | 7b9657d41a814cadd72d44cba90c00e62d7952ef (patch) | |
tree | 6a7e09f58e5cd1a43169daaa13f8967b77dc6a15 /prosody | |
parent | 696099ca4cdf221f8c81d19aa25bb3457fdea7b7 (diff) | |
parent | 42c69fe33960001f3183582d0fceb57cbae72cb3 (diff) | |
download | prosody-7b9657d41a814cadd72d44cba90c00e62d7952ef.tar.gz prosody-7b9657d41a814cadd72d44cba90c00e62d7952ef.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions