aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-22 14:33:18 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-22 14:33:18 +0100
commit1e6ba98ab9a82185e694bfd3c9c3fc5eeb24c281 (patch)
treecad2cfc2b92d19767b0aeef7752b85b54623d09d /doc
parentd80344403875aa57f84b249918c294601dc9cfff (diff)
parentce2b29fe493364b4a48a43bda19e9819bb3275a6 (diff)
downloadprosody-1e6ba98ab9a82185e694bfd3c9c3fc5eeb24c281.tar.gz
prosody-1e6ba98ab9a82185e694bfd3c9c3fc5eeb24c281.zip
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions