Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 11 Jun 2015 12:30:44 +0000 (14:30 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 11 Jun 2015 12:30:44 +0000 (14:30 +0200)

Trivial merge