From: mand1nga <mand1nga@xonotic.org>
Date: Mon, 29 Aug 2011 17:23:41 +0000 (-0300)
Subject: Merge branch 'mand1nga/update-docs'
X-Git-Tag: xonotic-v0.5.0~15^2~2
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f41a70c69aa6b0237ea360d221d89876e8dae3ef

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

f41a70c69aa6b0237ea360d221d89876e8dae3ef