From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Fri, 2 Apr 2010 12:23:15 +0000 (+0200)
Subject: Merge commit 'origin/mand1nga/rebrand'
X-Git-Tag: xonotic-v0.1.0preview~520
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=1bc0cc65a12e4acdc5e104d0a3e6094848fb233d

Merge commit 'origin/mand1nga/rebrand'
---

1bc0cc65a12e4acdc5e104d0a3e6094848fb233d