Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 31 May 2017 20:26:45 +0000 (21:26 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 31 May 2017 20:26:45 +0000 (21:26 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge