Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Jun 2015 19:56:58 +0000 (21:56 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Jun 2015 19:56:58 +0000 (21:56 +0200)

Trivial merge