From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Wed, 15 Oct 2014 20:38:13 +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~6
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=5ae99dd2d1ed307959f25143e6c343a53e4df373

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

5ae99dd2d1ed307959f25143e6c343a53e4df373
diff --cc config/rootfiles/common/armv5tel/initscripts
index e856697b9a,dfe2e4869e..c761e26672
mode 100755,100644..100755
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
diff --cc config/rootfiles/common/i586/initscripts
index af099ba69b,622886fd64..525c55c455
mode 100755,100644..100755
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
diff --cc lfs/initscripts
index 02f97431a2,4acf65e13e..4acf65e13e
mode 100755,100644..100755
--- a/lfs/initscripts
+++ b/lfs/initscripts