Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 12 Jan 2014 22:02:28 +0000 (23:02 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 12 Jan 2014 22:02:28 +0000 (23:02 +0100)

Trivial merge