Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Jan 2014 15:45:44 +0000 (16:45 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Jan 2014 15:45:44 +0000 (16:45 +0100)

Trivial merge