aboutsummaryrefslogtreecommitdiffstats
path: root/prosodyctl
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-06-03 12:29:27 +0100
committerMatthew Wild <mwild1@gmail.com>2010-06-03 12:29:27 +0100
commit1486d4fdae138f0e45df3e8b6c3213978b27b46d (patch)
treecdbd7d0165c8fd0c3be97c2fa3ced6e09048c1cc /prosodyctl
parent27ecf036809bda70b9d279b2bd94a2e7e40dd9c0 (diff)
parentef6c6f531d1c2c9c16989ecf4d975009395536a1 (diff)
downloadprosody-1486d4fdae138f0e45df3e8b6c3213978b27b46d.tar.gz
prosody-1486d4fdae138f0e45df3e8b6c3213978b27b46d.zip
Merge 0.7->trunk
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions