aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-05-11 01:53:32 +0100
committerMatthew Wild <mwild1@gmail.com>2012-05-11 01:53:32 +0100
commitfd5826e721ca1ffa36bd4bb69cef86d1629e2d50 (patch)
treec6d3dd80f6be503871411f837d01ca82f344457e /doc
parentf73fb5fdd4a9f66a5539c33be875d4d9fe63b5d1 (diff)
parentaceb78e16b9acb74f6d3e3625312126a06cc65b7 (diff)
downloadprosody-fd5826e721ca1ffa36bd4bb69cef86d1629e2d50.tar.gz
prosody-fd5826e721ca1ffa36bd4bb69cef86d1629e2d50.zip
Merge with Maranda
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions