From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Wed, 22 Oct 2014 18:51:32 +0000 (+0200)
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~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07562a76208386065c56386b3a77f44137d16c2f;p=ipfire-2.x.git

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

07562a76208386065c56386b3a77f44137d16c2f