Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Thu, 12 Feb 2015 18:40:54 +0000 (19:40 +0100)
committerMatthias Fischer <fischerm@ipfire.org>
Thu, 12 Feb 2015 18:40:54 +0000 (19:40 +0100)

Trivial merge