Merge branch 'master' into kernel-test
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 07:22:42 +0000 (09:22 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 29 Sep 2014 07:22:42 +0000 (09:22 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge