aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2012-12-29 19:13:42 +0100
committerKim Alvefur <zash@zash.se>2012-12-29 19:13:42 +0100
commitf9b9d6c4d2b71e142bc7cd254bc91171e32b2825 (patch)
tree085b256214be1d86062ebb25c7729451da838e12 /doc
parent45f6b0c64c3ab63603fe8bc8b29f2dbc835b4e92 (diff)
parent7dfcd3b6d48a94c2004353bd26da730d29a7509b (diff)
downloadprosody-f9b9d6c4d2b71e142bc7cd254bc91171e32b2825.tar.gz
prosody-f9b9d6c4d2b71e142bc7cd254bc91171e32b2825.zip
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions