From: mand1nga <mand1nga@xonotic.org>
Date: Mon, 29 Aug 2011 16:05:53 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/update-docs
X-Git-Tag: xonotic-v0.5.0~15^2~2^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4025b24009d98a0418fc2de9e55687d971503c0c;p=xonotic%2Fxonotic.git

Merge branch 'master' into mand1nga/update-docs
---

4025b24009d98a0418fc2de9e55687d971503c0c