diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-05-22 20:07:20 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-05-22 20:07:20 +0100 |
commit | 02a58e54db100bda071a7043bbcfc0022d3a10af (patch) | |
tree | 3473c4c4cae6c0f24a20b75f573512f2e5ebc36c /doc | |
parent | 604184d80b428979f16fdfeef4b7e3ca69e470d9 (diff) | |
parent | 59957bc13cbf9c18c8e7379559455d5d1802e7ec (diff) | |
download | prosody-02a58e54db100bda071a7043bbcfc0022d3a10af.tar.gz prosody-02a58e54db100bda071a7043bbcfc0022d3a10af.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions