Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x into install-raid
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 Oct 2014 05:18:03 +0000 (07:18 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 Oct 2014 05:18:03 +0000 (07:18 +0200)

Trivial merge