Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 11 Feb 2015 13:58:10 +0000 (14:58 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 11 Feb 2015 13:58:10 +0000 (14:58 +0100)

Trivial merge