Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir into cbrut...
authorcbrutail <ruszkai.akos@gmail.com>
Mon, 1 Nov 2010 14:09:29 +0000 (15:09 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Mon, 1 Nov 2010 14:09:29 +0000 (15:09 +0100)

Trivial merge