diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-06-13 23:24:36 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-06-13 23:24:36 +0100 |
commit | 9052e8bf8faf0c5cf0d5f645cbe2abe8e6464817 (patch) | |
tree | 79ee0e0fb16935e5bccc66437d2064837668f111 /prosodyctl | |
parent | 68036030e2d66232f23135cd6830e313be013432 (diff) | |
parent | cd8304b6e0e62e9b917b640778580cf538b52b3c (diff) | |
download | prosody-9052e8bf8faf0c5cf0d5f645cbe2abe8e6464817.tar.gz prosody-9052e8bf8faf0c5cf0d5f645cbe2abe8e6464817.zip |
Merge the merge
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions