Merge remote-tracking branch 'ms/native-arm-compiling' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 May 2014 21:46:14 +0000 (23:46 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 26 May 2014 21:46:14 +0000 (23:46 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge