Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Tue, 27 Jan 2015 12:33:01 +0000 (13:33 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Tue, 27 Jan 2015 12:33:01 +0000 (13:33 +0100)

Trivial merge