diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-10-14 10:59:54 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-10-14 10:59:54 +0100 |
commit | 49c32aaaeb47bdcef6522136cd9b096ce84e97b9 (patch) | |
tree | 5ad39be8aac11ff828d4ff5a36227b480a509cb3 /doc | |
parent | e58a22fd47b0b0b50ae06527df8fa23f02e1c6a6 (diff) | |
parent | 4d822c8eaf0556bc2a0e3cfd5dcb71fa8fedc9d2 (diff) | |
download | prosody-49c32aaaeb47bdcef6522136cd9b096ce84e97b9.tar.gz prosody-49c32aaaeb47bdcef6522136cd9b096ce84e97b9.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions