Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 17 Mar 2015 13:05:56 +0000 (14:05 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 17 Mar 2015 13:05:56 +0000 (14:05 +0100)
1  2 
config/rootfiles/common/armv5tel/initscripts
config/rootfiles/common/i586/initscripts