diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-04-15 16:43:08 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-04-15 16:43:08 +0100 |
commit | 6c0fbb813fe6fc10fefeb076221e756521bd033e (patch) | |
tree | 283cdf9c8f06279d6e30071dcf82fcb1dfd09a44 /doc | |
parent | 5f344ff0956b7dd54d190c579904c5a25ef6d2cd (diff) | |
parent | 0e656606c0200da0f0b35df4bd827245a2828fa7 (diff) | |
download | prosody-6c0fbb813fe6fc10fefeb076221e756521bd033e.tar.gz prosody-6c0fbb813fe6fc10fefeb076221e756521bd033e.zip |
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions