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

Trivial merge