Merge branch 'fireinfo'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Nov 2010 14:39:30 +0000 (15:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Nov 2010 14:39:30 +0000 (15:39 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge