Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jan 2010 18:28:18 +0000 (19:28 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jan 2010 18:28:18 +0000 (19:28 +0100)
commitde20524ed3e6aaab52bb3009c807ae3602f8e273
tree777db692d3b828461119ad41f72912e2606ffd2d
parent11c4cfcea8f2176c7ee24faff3d34ccf6afdd5e2
parentc791bb2a5982940068bcfdfe4845d233be283aa3
Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

Conflicts:
config/rootfiles/core/35/filelists/files
config/rootfiles/core/35/filelists/files