aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-07-08 21:41:31 +0100
committerMatthew Wild <mwild1@gmail.com>2013-07-08 21:41:31 +0100
commit316d5d6e0833d55bb49d8a2f8ba8afd9b6dd2ba5 (patch)
treec26e0fdeb8230cec51561eb0c5dfeda12ab1d7ce /doc
parent14cde80a1f8570920e598509710f2dc61b7a2510 (diff)
parentfb9838c64b97cd51c87a6cc251a6049e11eeba94 (diff)
downloadprosody-316d5d6e0833d55bb49d8a2f8ba8afd9b6dd2ba5.tar.gz
prosody-316d5d6e0833d55bb49d8a2f8ba8afd9b6dd2ba5.zip
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions