From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Tue, 27 Jan 2015 12:33:01 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
X-Git-Tag: v2.17-core91~40^2~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1f369eb1ee97edad4b81518649fd8672763e252;p=ipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
---

a1f369eb1ee97edad4b81518649fd8672763e252