Merge remote-tracking branch 'origin/master' into kernel-test
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Aug 2014 15:07:26 +0000 (17:07 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Aug 2014 15:07:26 +0000 (17:07 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge