]> 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: 1f1fe78 9bddee0)
Merge branch 'master' into core41
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Oct 2010 13:00:31 +0000 (15:00 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Oct 2010 13:00:31 +0000 (15:00 +0200)

Trivial merge
IPFire 2.x development tree