]> git.ipfire.org Git - people/trikolon/ipfire-2.x.git/commit
fix core58 merge problem.
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 5 May 2012 21:21:18 +0000 (23:21 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 12 May 2012 17:30:30 +0000 (19:30 +0200)
commit8f6a5178e816689fc6bd38aebfc0cfc41aa5d37d
treec482750fbca1f60e39abbc526054e4293861dc40
parent54798036675c0eebb8dedb55d2e509d8385cc363
fix core58 merge problem.

Conflicts:

config/rootfiles/core/58/filelists/files
config/rootfiles/core/58/filelists/files