From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 8 Aug 2010 19:32:46 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/merlijn/osx-logo'
X-Git-Tag: xonotic-v0.1.0preview~321
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=bcd1ea2c98b611278139e0d720952d738006b985

Merge remote branch 'refs/remotes/origin/merlijn/osx-logo'
---

bcd1ea2c98b611278139e0d720952d738006b985