Merge branch 'master' into next

author Michael Tremer <michael.tremer@ipfire.org>

Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)

committer Michael Tremer <michael.tremer@ipfire.org>

Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
author Michael Tremer <michael.tremer@ipfire.org>
Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
committer Michael Tremer <michael.tremer@ipfire.org>
Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
diff --cc config/rootfiles/common/armv5tel/initscripts

index e529e6644f92b9be10dc7d1a30b1304bbd6957bc,60ef0ef19c9089375a75ee1790ec8319d0f0c6a2..6347cafc4c90d97677e2c65339ff3041855c8f90

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

index 4894710ac371923dc6c0921723e69593fbb9f726,f656c72a7458025459f1481a568a1721f4059804..f656c72a7458025459f1481a568a1721f4059804

mode 100755,100644..100755
--- 1/lfs/initscripts
--- 2/lfs/initscripts
+++ b/lfs/initscripts
diff --cc lfs/strongswan
Simple merge
diff --cc make.sh
Simple merge
author	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
committer	Michael Tremer <michael.tremer@ipfire.org>
	Wed, 4 Feb 2015 12:24:05 +0000 (13:24 +0100)
		1	2
config/rootfiles/common/armv5tel/initscripts	patch \|	diff1 \|	diff2 \|	blob \| history
lfs/initscripts	patch \|	diff1 \|	diff2 \|	blob \| history
lfs/strongswan	patch \|	diff1 \|	diff2 \|	blob \| history
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history