diff options
author | Kim Alvefur <zash@zash.se> | 2013-07-22 20:29:41 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-07-22 20:29:41 +0200 |
commit | 935cf8ba76b20eb03b4f6dfa09bfb8e165d2baab (patch) | |
tree | 4c9f44f3548eb4deb16319ad3b8c7c4128c6b771 /prosody | |
parent | e5f6bd8c4cda458ae25900c74b4c751913829dd3 (diff) | |
parent | 4b01c2691b2d731c7cf9a60d063010515ad731de (diff) | |
download | prosody-935cf8ba76b20eb03b4f6dfa09bfb8e165d2baab.tar.gz prosody-935cf8ba76b20eb03b4f6dfa09bfb8e165d2baab.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions