Merge branch 'master' into next

author Arne Fitzenreiter <arne_f@ipfire.org>

Tue, 17 Mar 2015 13:05:56 +0000 (14:05 +0100)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Tue, 17 Mar 2015 13:05:56 +0000 (14:05 +0100)
author Arne Fitzenreiter <arne_f@ipfire.org>
Tue, 17 Mar 2015 13:05:56 +0000 (14:05 +0100)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Tue, 17 Mar 2015 13:05:56 +0000 (14:05 +0100)
diff --cc config/rootfiles/common/armv5tel/initscripts

index 05b8ceebe84d45295eec6c4d5b7cad8320243d1f,52487669ae19830a73c17cb9f05804a56e4b0bf4..8ddf34ae87fa656dc450c1e5ad47387dbf1c616f

mode 100755,100644..100644
--- 1/config/rootfiles/common/armv5tel/initscripts
--- 2/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
diff --cc config/rootfiles/common/i586/initscripts

index d4779ab054230c54c893e27120899faf9b791be1,845ae504b3f38327734ad393274a796542ed6745..3d4dd62ff0495f52d8a5ea59b0d83c3be3c87df9

mode 100755,100644..100644
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Tue, 17 Mar 2015 13:05:56 +0000 (14:05 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Tue, 17 Mar 2015 13:05:56 +0000 (14:05 +0100)
		1	2
config/rootfiles/common/armv5tel/initscripts	patch \|	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/i586/initscripts	patch \|	diff1 \|	diff2 \|	blob \| history