Merge branch 'kuniuthefrogg/abyss' of ssh://push.git.xonotic.org/xonotic-maps.pk3dir...
authorkuniuthefrogg <ekuniu@gmail.com>
Fri, 1 Mar 2013 22:19:14 +0000 (23:19 +0100)
committerkuniuthefrogg <ekuniu@gmail.com>
Fri, 1 Mar 2013 22:19:14 +0000 (23:19 +0100)

Trivial merge