aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-05-18 13:20:46 +0200
committerKim Alvefur <zash@zash.se>2013-05-18 13:20:46 +0200
commit2794871c57db8605a99583de29df2168181715c2 (patch)
tree0f2cb51dea138f8394524c68f5cfb3f876c3e20b /doc
parent651c67dc6b70b1e0fac99e1f864656d335974f69 (diff)
parentaa4b5036e35c1e60d3eba1fc2eeeaf96ae76ab15 (diff)
downloadprosody-2794871c57db8605a99583de29df2168181715c2.tar.gz
prosody-2794871c57db8605a99583de29df2168181715c2.zip
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions