Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic
Authored by: r00t 2013-02-15
Parents: [3a7a95][dda76f]