Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Jul 2015 16:58:11 +0000 (18:58 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Jul 2015 16:58:11 +0000 (18:58 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge