Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into monit
authorDirk Wagner <dirk.wagner@ipfire.org>
Wed, 15 Oct 2014 20:38:13 +0000 (22:38 +0200)
committerDirk Wagner <dirk.wagner@ipfire.org>
Wed, 15 Oct 2014 20:38:13 +0000 (22:38 +0200)
1  2 
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts
lfs/initscripts
make.sh

diff --cc lfs/initscripts
index 02f9743,4acf65e..4acf65e
mode 100755,100644..100755
diff --cc make.sh
Simple merge