Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 18 Mar 2014 17:00:42 +0000 (18:00 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 18 Mar 2014 17:00:42 +0000 (18:00 +0100)

Trivial merge