aboutsummaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-08 18:48:28 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-08 18:48:28 +0100
commit2fcd8af884edb9278d2c0cb770c879c43badd2c2 (patch)
tree03f7a2da185371615ec7ca54b84c5f0aaafec986 /man
parent518414dbf7c6d45ca115b080b0fe19f6fdf93cc7 (diff)
parented8cf4230df5d2b6d5118cd0912c285e00d9331a (diff)
downloadprosody-2fcd8af884edb9278d2c0cb770c879c43badd2c2.tar.gz
prosody-2fcd8af884edb9278d2c0cb770c879c43badd2c2.zip
Merge with backout
Diffstat (limited to 'man')
0 files changed, 0 insertions, 0 deletions