Merge branch 'master' into zykure/approved
[xonotic/xonstat.git] / COPYING.txt
2011-04-01 Ant ZucaroAdd license.