aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-07-15 23:43:37 +0100
committerMatthew Wild <mwild1@gmail.com>2013-07-15 23:43:37 +0100
commitc98ee8bbb18a9612a032c2d0fefe41b85dd177c9 (patch)
tree8e5ce2a363febfc45c7cf34f2dd46904487d02a2 /doc
parentfcdcd272b805eece49698cec15ad2e9f94e19e54 (diff)
parent09c3308b84275a9a222413cfa332229704388985 (diff)
downloadprosody-c98ee8bbb18a9612a032c2d0fefe41b85dd177c9.tar.gz
prosody-c98ee8bbb18a9612a032c2d0fefe41b85dd177c9.zip
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions