Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into pre-firewall
authorAlexander Marx <amarx@ipfire.org>
Wed, 5 Jun 2013 20:11:44 +0000 (22:11 +0200)
committerAlexander Marx <amarx@ipfire.org>
Wed, 5 Jun 2013 20:11:44 +0000 (22:11 +0200)

Trivial merge