diff options
author | Matthew Wild <mwild1@gmail.com> | 2010-05-05 15:33:58 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2010-05-05 15:33:58 +0100 |
commit | 1dce4a3033300f40a4b74b286162bab34337f9bb (patch) | |
tree | 1c819b3d1b29b20b4b275bdb6c884a1c1bd4af83 /prosodyctl | |
parent | 697b71895ecc7968c2cb56058abded5017ecb090 (diff) | |
parent | ec60bf9e1b50e97162097027e852ce5d0db4bdf8 (diff) | |
download | prosody-1dce4a3033300f40a4b74b286162bab34337f9bb.tar.gz prosody-1dce4a3033300f40a4b74b286162bab34337f9bb.zip |
Merge 0.7->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions