Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Mar 2014 21:04:48 +0000 (22:04 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 17 Mar 2014 21:04:48 +0000 (22:04 +0100)

Trivial merge