From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 16 Jun 2013 16:27:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/matthiaskrgr/all_grep'
X-Git-Tag: xonotic-v0.8.0~119
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=45b21798ff29f4d2e47c67e7239c32945590ad82;p=xonotic%2Fxonotic.git

Merge remote-tracking branch 'origin/matthiaskrgr/all_grep'
---

45b21798ff29f4d2e47c67e7239c32945590ad82