From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 03:51:25 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/debugger/oilrig'
X-Git-Tag: xonotic-v0.7.0~30
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3b42fb967d684e7e6c5bc77e152b6c75b477d7c9;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/debugger/oilrig'
---

3b42fb967d684e7e6c5bc77e152b6c75b477d7c9