aboutsummaryrefslogtreecommitdiffstats
path: root/man/prosodyctl.man
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-03 22:05:05 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-03 22:05:05 +0000
commit8862e1b27eb767c99a068d13bd15c77c2c9e1471 (patch)
tree067f338a5f8e31a6b1fb6ca706562a044af80024 /man/prosodyctl.man
parent87ff54c75266ffa37f716d1c7a542e956bbe54b3 (diff)
parent5d9b9b6b30f06a3e3aa957279357dd42ae19ddf4 (diff)
downloadprosody-8862e1b27eb767c99a068d13bd15c77c2c9e1471.tar.gz
prosody-8862e1b27eb767c99a068d13bd15c77c2c9e1471.zip
Merge 0.6.2/waqas with 0.6.2/MattJ
Diffstat (limited to 'man/prosodyctl.man')
-rw-r--r--man/prosodyctl.man2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/prosodyctl.man b/man/prosodyctl.man
index e677443f..44a84145 100644
--- a/man/prosodyctl.man
+++ b/man/prosodyctl.man
@@ -76,4 +76,4 @@ determine if a host has been configured.
More information may be found online at: \fIhttp://prosody.im/\fP
.SH AUTHORS
-Dwayne Bent <dbb.0@liqd.org>
+Dwayne Bent <dbb.1@liqd.org>