diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-05-17 11:57:01 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-05-17 11:57:01 +0100 |
commit | 08ace7b7890a0c19a5cd5cf155df25e95d47e44a (patch) | |
tree | d5632da080555b929180dc818f51b49d69918ab2 /prosodyctl | |
parent | 93fbb53acdb0e7ecd7d8745ca514417b3fde1e6f (diff) | |
parent | cfb093a9f4e464fba1e56c2e3e340ece4219a411 (diff) | |
download | prosody-08ace7b7890a0c19a5cd5cf155df25e95d47e44a.tar.gz prosody-08ace7b7890a0c19a5cd5cf155df25e95d47e44a.zip |
Merge 0.7/MattJ with 0.7
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions