From: Matthias Fischer <fischerm@ipfire.org>
Date: Sun, 8 Mar 2015 08:49:44 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into logwatch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e6f74df8923eb09455248fd5940996f02cc7202;p=people%2Fms%2Fipfire-2.x.git

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

1e6f74df8923eb09455248fd5940996f02cc7202