aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-11-24 10:45:15 +0000
committerMatthew Wild <mwild1@gmail.com>2015-11-24 10:45:15 +0000
commitbb5b8e848bc1285f6a842aa781f94492cbcffc37 (patch)
treed9e472e08779616496a61520560acdaa166afc10 /doc
parent217d0135d1da5f00a8b21dcca8b61ff16dd126d0 (diff)
parent89bc6c6ad740c0c309fd9679eca8c4c8006177d8 (diff)
downloadprosody-bb5b8e848bc1285f6a842aa781f94492cbcffc37.tar.gz
prosody-bb5b8e848bc1285f6a842aa781f94492cbcffc37.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions