From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 4 Feb 2015 12:24:05 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de0ccf8f8c9fc6b695f45a3fdcf0a85c3b3d5299;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' into next

Conflicts:
	make.sh
---

de0ccf8f8c9fc6b695f45a3fdcf0a85c3b3d5299
diff --cc config/rootfiles/common/armv5tel/initscripts
index e529e6644f,60ef0ef19c..6347cafc4c
mode 100755,100644..100755
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
diff --cc lfs/initscripts
index 4894710ac3,f656c72a74..f656c72a74
mode 100755,100644..100755
--- a/lfs/initscripts
+++ b/lfs/initscripts