]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4c6ba2 4c4a347)
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Oct 2010 06:33:27 +0000 (08:33 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Oct 2010 06:33:27 +0000 (08:33 +0200)
Conflicts:
config/rootfiles/core/41/filelists/files


Trivial merge
Timo's tree of IPFire 2.x