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

author Dirk Wagner <dirk.wagner@ipfire.org>

Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)

committer Dirk Wagner <dirk.wagner@ipfire.org>

Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)
author Dirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)
committer Dirk Wagner <dirk.wagner@ipfire.org>
Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)
diff --cc config/rootfiles/common/armv5tel/initscripts

index 0a1a81109d553a5def8f42f0f4ccc4cb3f32360e,1ec9ed4f4bfa5b4db3ba304d860c779d8c7c9d7d..e856697b9ab71171f8791059000d45b50ff81b74

mode 100755,100644..100755
--- 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 d48d6a51be6543cc703c9cccea57e2c38a2e5313,153a5f49e7612c4feb55aaf712f1b411b19bccb2..af099ba69b7674055ea6812904fa1e5d107972f8

mode 100755,100644..100755
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
diff --cc make.sh
Simple merge
author	Dirk Wagner <dirk.wagner@ipfire.org>
	Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)
committer	Dirk Wagner <dirk.wagner@ipfire.org>
	Wed, 23 Jul 2014 08:37:02 +0000 (10:37 +0200)
		1	2
config/rootfiles/common/armv5tel/initscripts	patch \|	diff1 \|	diff2 \|	blob \| history
config/rootfiles/common/i586/initscripts	patch \|	diff1 \|	diff2 \|	blob \| history
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history