Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 07:44:03 +0000 (09:44 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 6 May 2015 07:44:03 +0000 (09:44 +0200)

Trivial merge