Merge remote-tracking branch 'origin/next' into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Aug 2014 14:29:22 +0000 (16:29 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 24 Aug 2014 14:29:22 +0000 (16:29 +0200)

Trivial merge