diff options
author | Matthew Wild <mwild1@gmail.com> | 2016-07-21 12:24:18 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2016-07-21 12:24:18 +0100 |
commit | 96713c8ff024e30feb1ef77b86542600e8873229 (patch) | |
tree | 538e92b2e399e53ecf4d4a703ffbd5e4dc40289f /COPYING | |
parent | 6fe51ecd17bd73e31105e27aa99fca9e0951a1d5 (diff) | |
parent | 0a1f044d219e82e1fd7f3fb05a46cc2ed76bba26 (diff) | |
download | prosody-96713c8ff024e30feb1ef77b86542600e8873229.tar.gz prosody-96713c8ff024e30feb1ef77b86542600e8873229.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions