aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-03 19:34:41 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-03 19:34:41 +0000
commitfd7b0786e552e1a1d8dd978d3526f9ecddfa4f6b (patch)
tree30ee1a06f2c70b3f6128e7294d07cc6f625740ed /doc
parentd2d44b512ba429551e7ce843d64c25be745a8dd5 (diff)
parent11538c72c66d63aa440373558f36f646a2985ec1 (diff)
downloadprosody-fd7b0786e552e1a1d8dd978d3526f9ecddfa4f6b.tar.gz
prosody-fd7b0786e552e1a1d8dd978d3526f9ecddfa4f6b.zip
Automated merge with http://84.46.7.57:1234
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions