From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 2 Dec 2014 16:20:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'mfischer/file' into next
X-Git-Tag: v2.17-core89~83^2~50
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=0c61cd9cea3a0124c26463e3e3c52996db285a93

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

0c61cd9cea3a0124c26463e3e3c52996db285a93