diff options
author | Kim Alvefur <zash@zash.se> | 2013-08-06 14:35:03 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-08-06 14:35:03 +0200 |
commit | 323683f4074f73a3a21ca71b7691d29a05716a14 (patch) | |
tree | 43e921f6bd3937398e258a64aa064ae01360625e /doc | |
parent | affa1690f4a7c003a3eac9b42ff0dfe72d92201e (diff) | |
parent | 2d80fe3bbd1722cc703390bd9055902f7dd843bf (diff) | |
download | prosody-323683f4074f73a3a21ca71b7691d29a05716a14.tar.gz prosody-323683f4074f73a3a21ca71b7691d29a05716a14.zip |
Merge 0.9->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions