From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Wed, 18 Mar 2015 09:46:29 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
X-Git-Tag: v2.17-core91~154^2~3
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=35817283ac87378350b1149ea466a1c4432449e8

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

35817283ac87378350b1149ea466a1c4432449e8