diff options
author | Kim Alvefur <zash@zash.se> | 2013-06-02 19:27:45 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-06-02 19:27:45 +0200 |
commit | 19f45e83ed793302d6ad65438acfbfb6da742d29 (patch) | |
tree | 8682d1e5655d123e3db62a1c4313216d976053bd /prosody | |
parent | 953b24c0ca0d5245a54828d4ce4619262f0e80a7 (diff) | |
parent | 323d7007f6b77c219602433f1f179ff642ae7afe (diff) | |
download | prosody-19f45e83ed793302d6ad65438acfbfb6da742d29.tar.gz prosody-19f45e83ed793302d6ad65438acfbfb6da742d29.zip |
Merge 0.9->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions