diff options
author | Kim Alvefur <zash@zash.se> | 2015-04-05 15:22:33 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2015-04-05 15:22:33 +0200 |
commit | 0f75dc0721890e9426fc45938423a2b94d06ba6f (patch) | |
tree | d3159081b883ccf8010593d5f882982116322e22 /COPYING | |
parent | bb866fc12337b648ad43b4cce6753e5ab8de251a (diff) | |
parent | 699bb065b9587204b0b4e200bf0c36e55d8d7c8f (diff) | |
download | prosody-0f75dc0721890e9426fc45938423a2b94d06ba6f.tar.gz prosody-0f75dc0721890e9426fc45938423a2b94d06ba6f.zip |
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions