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-Tag: v2.17-core89~83^2~52
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=7294c83b5bb6aa8dd16762d70c8df56115c555b8;hp=-c

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

7294c83b5bb6aa8dd16762d70c8df56115c555b8