diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-07-25 13:02:46 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-07-25 13:02:46 +0100 |
commit | 8a4ed9466f3b877d7a6e2c87f1cbec73c4a3c516 (patch) | |
tree | 56c01e1263e5c9fb3d1b580179e3bbaf119530b3 /prosody | |
parent | bb40012ca2d5a7eb38d86f4cef5488b31f6da0d0 (diff) | |
parent | 999a5a0cb3e13f5922d5c64418162ff463f1abd7 (diff) | |
download | prosody-8a4ed9466f3b877d7a6e2c87f1cbec73c4a3c516.tar.gz prosody-8a4ed9466f3b877d7a6e2c87f1cbec73c4a3c516.zip |
Merge 0.10->trunk
Diffstat (limited to 'prosody')
0 files changed, 0 insertions, 0 deletions