Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Feb 2011 19:33:00 +0000 (20:33 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 18 Feb 2011 19:33:00 +0000 (20:33 +0100)
commit48a2495afd78163adfd984689ab1c08091fdd2d3
tree4436b155789d14d57b0245045774ccf741687771
parentabcbbd1fd7d11549b7c44e301f17a4b9596a04b5
parentdb0798e82af1d7bdc83f319d06276c923d4fc012
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

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