Merge remote branch 'refs/remotes/origin/mookow/map-g-23'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:53:51 +0000 (05:53 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 24 Aug 2010 03:53:51 +0000 (05:53 +0200)
1  2 
maps/g-23.map

diff --cc maps/g-23.map
Simple merge