From: Dirk Wagner <dirk.wagner@ipfire.org>
Date: Sat, 14 Jun 2014 07:41:59 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
X-Git-Tag: v2.17-core91~40^2~1^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2407ace4946f1c0af6c43e6139337b76bfabaa7f;p=ipfire-2.x.git

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

2407ace4946f1c0af6c43e6139337b76bfabaa7f
diff --cc config/rootfiles/common/armv5tel/initscripts
index 2fffcf5267,5d5c692049..0a1a81109d
mode 100755,100644..100755
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
diff --cc config/rootfiles/common/i586/initscripts
index a264267f86,fa3dbcdb8c..d48d6a51be
mode 100755,100644..100755
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts