Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 3 Jul 2013 18:34:15 +0000 (20:34 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 3 Jul 2013 18:34:15 +0000 (20:34 +0200)

Trivial merge