aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-12-18 18:36:54 +0100
committerKim Alvefur <zash@zash.se>2013-12-18 18:36:54 +0100
commitece61cbae173be6abb4750578252f72c57b8eb8c (patch)
tree88339680df2e8df686a62d99a6c5bd28d1643de2 /doc
parent535e8c110294835d941ac834e88eeb8bb84d14f1 (diff)
parenta3dab92bb38f3c5b014cd94d646d74395424cfe3 (diff)
downloadprosody-ece61cbae173be6abb4750578252f72c57b8eb8c.tar.gz
prosody-ece61cbae173be6abb4750578252f72c57b8eb8c.zip
Merge 0.9->0.10
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions