Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 27 Mar 2014 14:07:26 +0000 (15:07 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 27 Mar 2014 14:07:26 +0000 (15:07 +0100)

Trivial merge