Merge remote-tracking branch 'mfischer/ntfs-3g' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Mar 2015 22:58:58 +0000 (23:58 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 4 Mar 2015 22:58:58 +0000 (23:58 +0100)

Trivial merge