aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-03-09 23:48:32 +0100
committerKim Alvefur <zash@zash.se>2014-03-09 23:48:32 +0100
commit7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0 (patch)
treebfeb64317bdac3d8e975d00d1ab26d3b7e340ce2 /COPYING
parent8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e (diff)
parent9ea9c5719a2275b3ae66378619cef64a392a1fec (diff)
downloadprosody-7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0.tar.gz
prosody-7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0.zip
Merge 0.10->trunk
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions