]> 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 | compact (merge: a398cc2 889a288)
Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Oct 2010 11:34:53 +0000 (13:34 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 23 Oct 2010 11:34:53 +0000 (13:34 +0200)
Conflicts:
src/paks/linux-pae/uninstall.sh


Trivial merge
Peter's tree of IPFire 2.x