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)
commit7c743d54f0c48f1cea6169efe09a68e0f27f18c0
tree21ff1a1f6fff10160299d73d6dca33fd487cdf14
parent514bee894cc0c0825fb874689d3e245d3fdaf1de
parent01d103a92b2091b0830f83256b9d35b83a9f9559
Merge branch 'fireinfo'
make.sh