Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Feb 2014 12:38:25 +0000 (13:38 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 5 Feb 2014 12:38:25 +0000 (13:38 +0100)

Trivial merge