From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 1 Dec 2011 20:37:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'maniacikarus/grep'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=143c9182c75ee18e97fdf08199fd7ac67d002ef7;p=ipfire-3.x.git

Merge remote-tracking branch 'maniacikarus/grep'
---

143c9182c75ee18e97fdf08199fd7ac67d002ef7