Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 22 Feb 2015 22:44:39 +0000 (23:44 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 22 Feb 2015 22:44:39 +0000 (23:44 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge