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)
commit254ba7337e17f8a0e669185948ae3c5debe70c9d
treeb660959f4ed0e0ee6dcfa1d62618c200a71a518a
parentc308a65ba272a982e959cb9b3ad88f5507bd663a
parent84647dd93e42da010a955727b1665770eae8dba2
Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore

Conflicts:
maps/g-23.map