Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 26 Mar 2014 22:42:57 +0000 (23:42 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 26 Mar 2014 22:42:57 +0000 (23:42 +0100)

Trivial merge