Merge branch 'master' of ssh://git.xonotic.org/xonotic
[xonotic/xonotic.git] / gpl.txt
2010-03-18 xonoticinitial checkin from nexuiz svn r8756