]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2165fbb 38a76ff)
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 21 Oct 2010 18:43:45 +0000 (20:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 21 Oct 2010 18:43:45 +0000 (20:43 +0200)
Conflicts:
config/rootfiles/core/41/filelists/files
src/paks/linux-pae/uninstall.sh


Trivial merge
Peter's tree of IPFire 2.x