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

Trivial merge