aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-02-03 15:52:27 +0100
committerKim Alvefur <zash@zash.se>2013-02-03 15:52:27 +0100
commit1929113b7830954ae60ad49934b3c16bf746a9ba (patch)
treea1d3fc24abd3048cb23d45b860640a83baa8c261 /doc
parent0f2d3d7139c741b6bd8714048694ee16a9b11c91 (diff)
parent5cfdac70c61ae6562f72868ef7b55129b166aa80 (diff)
downloadprosody-1929113b7830954ae60ad49934b3c16bf746a9ba.tar.gz
prosody-1929113b7830954ae60ad49934b3c16bf746a9ba.zip
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions