Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Wed, 18 Mar 2015 09:46:29 +0000 (10:46 +0100)
committerDirk Wagner <dirk.wagner@ipfire.org>
Wed, 18 Mar 2015 09:46:29 +0000 (10:46 +0100)

Trivial merge