Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Mon, 4 May 2015 18:15:24 +0000 (20:15 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Mon, 4 May 2015 18:15:24 +0000 (20:15 +0200)

Trivial merge