From: mand1nga <mand1nga@xonotic.org>
Date: Mon, 29 Aug 2011 16:00:59 +0000 (-0300)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.5.0~15^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0aac64457da9a8b6d8075266f6a403bb24fb84ba;p=xonotic%2Fxonotic.git

Merge branch 'master' of ssh://git.xonotic.org/xonotic
---

0aac64457da9a8b6d8075266f6a403bb24fb84ba