From: Samual Lenks <samual@xonotic.org>
Date: Mon, 3 Jun 2013 18:43:12 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/matthiaskrgr/website'
X-Git-Tag: xonotic-v0.7.0
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3e580da27c1e92dfd7ccd1f3b659250ad89d3a52;p=xonotic%2Fxonotic.git

Merge remote-tracking branch 'origin/matthiaskrgr/website'
---

deb8e4616eb74989291de9e010e02d9f1103c477