From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 30 Jan 2011 21:25:24 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/red_planet
X-Git-Tag: xonotic-v0.5.0~95^2~9^2~52
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89f29932ee776920d067d42c95d0ced73d6a6a83;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into mirceakitsune/red_planet
---

89f29932ee776920d067d42c95d0ced73d6a6a83