diff options
author | Matthew Wild <mwild1@gmail.com> | 2013-06-29 14:45:47 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2013-06-29 14:45:47 +0100 |
commit | 2489f372db5f8d584c537ba31844cdaf8fd19b10 (patch) | |
tree | 27741db74d498be76001287c8a4e6a9076bb5a27 /doc | |
parent | 5adcad1a43d110e0458b38c42b0a21a70eb5336e (diff) | |
parent | 82bd1a5967eba247d95ddde8d8d77197b2bada91 (diff) | |
download | prosody-2489f372db5f8d584c537ba31844cdaf8fd19b10.tar.gz prosody-2489f372db5f8d584c537ba31844cdaf8fd19b10.zip |
Merge
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions