Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Nov 2010 14:39:22 +0000 (15:39 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Nov 2010 14:39:22 +0000 (15:39 +0100)
commit514bee894cc0c0825fb874689d3e245d3fdaf1de
treeac8305b48002fd7fe405c410df0879bbb1cf37b9
parent1d4b178db05de5f1274009b92037c33c631f2dbf
parentc1db56367201e69f44d40369533a4e54338686a5
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x

Conflicts:
make.sh
config/rootfiles/common/initscripts
config/rootfiles/core/43/filelists/files
make.sh