From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Fri, 9 May 2014 07:00:20 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
X-Git-Tag: v2.17-core89~71^2~2^2~18
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=2beef649d438da5bda0a2df81e4601de54668487

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

2beef649d438da5bda0a2df81e4601de54668487