aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-10 03:57:17 +0100
committerKim Alvefur <zash@zash.se>2016-01-10 03:57:17 +0100
commit1df83ddc8cdb6a93f4b736f461cec71084bbf095 (patch)
tree64202f4daef595ff51640c1810fbb2751775faa4 /COPYING
parent8cdd08825d3ab4afddc12ddf75dc9af1924e8518 (diff)
parent0d98ccd02a37153aef1cbfb71ba9c103d43fbda7 (diff)
downloadprosody-1df83ddc8cdb6a93f4b736f461cec71084bbf095.tar.gz
prosody-1df83ddc8cdb6a93f4b736f461cec71084bbf095.zip
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions