From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 20 Aug 2010 17:46:11 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/diabolik/eX2xsources'
X-Git-Tag: xonotic-v0.1.0preview~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=67f2c3c60053f503c718cf5f1cf4a6166c0eed41;p=xonotic%2Fmediasource.git

Merge remote branch 'refs/remotes/origin/diabolik/eX2xsources'
---

67f2c3c60053f503c718cf5f1cf4a6166c0eed41