diff options
author | Kim Alvefur <zash@zash.se> | 2016-02-28 20:05:56 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2016-02-28 20:05:56 +0100 |
commit | 8e521f441ea38df4156e4945c564c11fefbffd17 (patch) | |
tree | 8212a106f78e4d988ee48d938496162cf17d890a /doc | |
parent | ffc455a307546e590923e3df6848bec2bc8fce17 (diff) | |
parent | 47450a0eff25547333f561ff2903f92d081c9bdf (diff) | |
download | prosody-8e521f441ea38df4156e4945c564c11fefbffd17.tar.gz prosody-8e521f441ea38df4156e4945c564c11fefbffd17.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions