diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-01-04 09:09:15 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-01-04 09:09:15 +0000 |
commit | 6a39c2064ccd3956857494208013e95515c3d6fd (patch) | |
tree | dee56adb63417f62c3f2ae5a05fa108f05122f73 /doc | |
parent | 6d5bf3651160efa69fb89bd2f92b11f7d69f4034 (diff) | |
parent | dc21fd08f46d714de6f8b8318b3c3ee212e97e2f (diff) | |
download | prosody-6a39c2064ccd3956857494208013e95515c3d6fd.tar.gz prosody-6a39c2064ccd3956857494208013e95515c3d6fd.zip |
Merge 0.10->trunk
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions