Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Aug 2012 20:52:20 +0000 (16:52 -0400)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Aug 2012 20:52:20 +0000 (16:52 -0400)
1  2 
make.sh

diff --cc make.sh
Simple merge