From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 2 Dec 2014 16:17:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'mfischer/grep' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7294c83b5bb6aa8dd16762d70c8df56115c555b8;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'mfischer/grep' into next
---

7294c83b5bb6aa8dd16762d70c8df56115c555b8