Merge remote-tracking branch 'mfischer/grep' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 16:17:39 +0000 (17:17 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 16:17:39 +0000 (17:17 +0100)
commit7294c83b5bb6aa8dd16762d70c8df56115c555b8
treebcbdd92499f315dbb6c2c4525de09988798b3ee8
parent02d860ebdad3b6a0ae2b3673984dab2068862dbe
parent7f88f8f569060f8f06c8dcc3875f4056b33f6dbb
Merge remote-tracking branch 'mfischer/grep' into next