diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-05-12 18:45:59 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-05-12 18:45:59 +0100 |
commit | 3ea5fffa9cedafcd138a5f41a62407baf39e3b56 (patch) | |
tree | c8b847d564b038e238fd22277830ca1f9a2a9f0f /doc | |
parent | 656c7f084cda32f900a51ffd2982340ff17792a8 (diff) | |
parent | 6e9ced38abe48ef15310ccc0d1fa93530e217cca (diff) | |
download | prosody-3ea5fffa9cedafcd138a5f41a62407baf39e3b56.tar.gz prosody-3ea5fffa9cedafcd138a5f41a62407baf39e3b56.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions