aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-07-25 13:54:47 +0100
committerMatthew Wild <mwild1@gmail.com>2014-07-25 13:54:47 +0100
commit132c641c95e07ebc28d346a503fc59085c881f6b (patch)
treeb398e0fb55f0e7a8fac8e78ef9ab82d6837e2f7e /doc
parent8a4ed9466f3b877d7a6e2c87f1cbec73c4a3c516 (diff)
parent713c007fc2b3dc18e86a57f73b86e814868259db (diff)
downloadprosody-132c641c95e07ebc28d346a503fc59085c881f6b.tar.gz
prosody-132c641c95e07ebc28d346a503fc59085c881f6b.zip
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions