]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 925038e 4527e3e)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Sep 2010 13:57:05 +0000 (15:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Sep 2010 13:57:05 +0000 (15:57 +0200)
Conflicts:
config/rootfiles/core/40/update.sh


Trivial merge
IPFire 2.x development tree