From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Thu, 3 Jun 2010 19:12:26 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/sourceforplayers
X-Git-Tag: xonotic-v0.1.0preview~42
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f74ce4f0941e865ac32de40973a5d25e15e99f8a;p=xonotic%2Fmediasource.git

Merge commit 'origin/master' into diabolik/sourceforplayers
---

f74ce4f0941e865ac32de40973a5d25e15e99f8a