From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 11 Apr 2015 19:58:09 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.17-core91~145
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=0fbba54e825ad4d21762e0deb788ec6614d0e744

Merge branch 'master' into next

Conflicts:
	lfs/monit
---

0fbba54e825ad4d21762e0deb788ec6614d0e744