Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
authorRudolf Polzer <divverent@alientrap.org>
Fri, 30 Dec 2011 17:59:22 +0000 (18:59 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 30 Dec 2011 17:59:22 +0000 (18:59 +0100)
Conflicts:
maps/g-23.map


Trivial merge