Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 12 Dec 2008 15:20:12 +0000 (16:20 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 12 Dec 2008 15:20:12 +0000 (16:20 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge