Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorChristian Schmidt <maniacikarus@ipfire.org>
Sat, 2 Apr 2011 17:49:11 +0000 (19:49 +0200)
committerChristian Schmidt <maniacikarus@ipfire.org>
Sat, 2 Apr 2011 17:49:11 +0000 (19:49 +0200)
commit80c7f007fe5c70b1bbfa56286806e73ae1e93bfa
tree02d5918641bf5a44b1d8b82cfec0ce83ac83403e
parent78e1facfba34d36f37f24ed0a232dadfeed72f61
parentcadb66f381e606df01509e9a4e388b1d3b85752b
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

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