Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 1 Jun 2017 13:43:48 +0000 (15:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 1 Jun 2017 13:43:48 +0000 (15:43 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge