aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-25 12:33:45 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-25 12:33:45 +0000
commitd06b399a17f3cb6dd362a4a97aa35e3c0d229cd5 (patch)
tree7600bdcb05be2d1105865b176f3395a23efaf70c /doc
parent44fe79faff36d674623e2189f37a4e8512bc207d (diff)
parent3a47c0c1736ab4b39d397e5d9c1285b3aba19071 (diff)
downloadprosody-d06b399a17f3cb6dd362a4a97aa35e3c0d229cd5.tar.gz
prosody-d06b399a17f3cb6dd362a4a97aa35e3c0d229cd5.zip
Merge 0.7->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions