Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into...
authorMirio <opivy@hotmail.de>
Tue, 17 Jun 2014 12:38:57 +0000 (14:38 +0200)
committerMirio <opivy@hotmail.de>
Tue, 17 Jun 2014 12:38:57 +0000 (14:38 +0200)
1  2 
maps/glowplant.mapinfo

Simple merge