Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Oct 2014 19:14:19 +0000 (21:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 21 Oct 2014 19:14:19 +0000 (21:14 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge