aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-02-24 16:25:45 +0000
committerMatthew Wild <mwild1@gmail.com>2012-02-24 16:25:45 +0000
commit9de25d7789ed5974d66a396aa1c5908e7d74bf29 (patch)
tree0fc9c99439149af544531ccd36cfeb50aabf0418 /doc
parent07151a029c71a7d868003f5ab3c76d4e9812eb2d (diff)
parentdc4689b625060e77b2c555e71e353719b48d5401 (diff)
downloadprosody-9de25d7789ed5974d66a396aa1c5908e7d74bf29.tar.gz
prosody-9de25d7789ed5974d66a396aa1c5908e7d74bf29.zip
Merge backout
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions