Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Apr 2015 11:07:30 +0000 (13:07 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Apr 2015 11:07:30 +0000 (13:07 +0200)

Trivial merge