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