aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-03-30 20:04:31 +0100
committerMatthew Wild <mwild1@gmail.com>2009-03-30 20:04:31 +0100
commit058336cefc0e1954bb3a9982b8c574bace2dbe76 (patch)
tree075cbafe89efc4c3e8ecbda4dab446ce076325f6 /doc
parent1dce551e58db0d49857d6ace87793259fc0aaeec (diff)
parent27d6ab1bf5447e6765896cea787a47d7312e780c (diff)
downloadprosody-058336cefc0e1954bb3a9982b8c574bace2dbe76.tar.gz
prosody-058336cefc0e1954bb3a9982b8c574bace2dbe76.zip
Automated merge with ssh://hg@prosody.im/prosody-hg
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions