Merge branch 'master' into divVerent/crypto2
[xonotic/xonotic.git] / gpl.txt
2010-03-18 xonoticinitial checkin from nexuiz svn r8756