Merge remote branch 'origin/master' into fruitiex/freezetag_mapinfo
authorFruitieX <fruitiex@gmail.com>
Fri, 26 Nov 2010 12:04:07 +0000 (14:04 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 26 Nov 2010 12:04:07 +0000 (14:04 +0200)
commita34e4566df6923ac2c27abe0cec5f021ec2e6dd1
treebf81b12b2637e44e3c10f672b9f263678f8aabb6
parent7ac6c13a644b1f87879db3a08858fc1c2ebd8797
parent1844e22d4d312eb1e2897a6f2ad7841db9bf14e9
Merge remote branch 'origin/master' into fruitiex/freezetag_mapinfo

Conflicts:
maps/g-23.mapinfo
maps/g-23.mapinfo
maps/red-planet.mapinfo