diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-05-11 21:35:08 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-05-11 21:35:08 +0100 |
commit | 5227a94ea822c9a4a9e60cd9a28278311494f5bd (patch) | |
tree | b2a35f6af2780d1bf095189c7cbaaf0c84c3e15b /prosodyctl | |
parent | 1bdf86cdff56a84540f7f695fcde3e0ef292bd18 (diff) | |
parent | bf578b83ea8c6b5500d08732decd74ccbcc7362d (diff) | |
download | prosody-5227a94ea822c9a4a9e60cd9a28278311494f5bd.tar.gz prosody-5227a94ea822c9a4a9e60cd9a28278311494f5bd.zip |
Merge with backout
Diffstat (limited to 'prosodyctl')
0 files changed, 0 insertions, 0 deletions