diff options
author | Matthew Wild <mwild1@gmail.com> | 2015-03-26 16:49:03 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2015-03-26 16:49:03 +0000 |
commit | 6c87dbadb1c9f96442f874dd78edd8b85abfb472 (patch) | |
tree | 5c9f629f0035697faa311531db3b3d0267e4f1e3 /doc | |
parent | 0cbc9ecbecd3caf2bab74dd77abab53ca77691f6 (diff) | |
parent | eacc284fd7299addca1a4f1a8332de6eab86480b (diff) | |
download | prosody-6c87dbadb1c9f96442f874dd78edd8b85abfb472.tar.gz prosody-6c87dbadb1c9f96442f874dd78edd8b85abfb472.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions