Merge remote-tracking branch 'origin/core66' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Feb 2013 13:29:26 +0000 (14:29 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 16 Feb 2013 13:29:26 +0000 (14:29 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge