Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Apr 2011 08:39:08 +0000 (10:39 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Apr 2011 08:39:08 +0000 (10:39 +0200)
commit603e55bb100e5c46b298d84b702e0d560d97ed03
tree253d1a5f3c4dc355f53e163ca5de25a84e049402
parent377aa9b34d237d4180df182482bfda8ec327cfc3
parentf40fd7918a407a4054181c34e4e61264107de957
Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

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