Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 2 Apr 2011 15:56:33 +0000 (17:56 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 2 Apr 2011 15:56:33 +0000 (17:56 +0200)
commitcadb66f381e606df01509e9a4e388b1d3b85752b
treea739e870829b8df1a2579d022a7c8ea433ffda87
parent2d84d37af6df59404760cf4d1413a7b019ba295c
parentc03cf9ea9db6ed0d757b44211a6df6116275078c
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

Conflicts:
config/rootfiles/core/49/filelists/files
config/rootfiles/core/49/update.sh
config/rootfiles/core/49/filelists/files