Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Sep 2008 19:38:52 +0000 (19:38 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Sep 2008 19:38:52 +0000 (19:38 +0000)
1  2 
make.sh

diff --cc make.sh
Simple merge