]> 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: 1c49a60 6fadf39)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorArne Fitzennreiter <arne_f@ipfire.org>
Mon, 20 Oct 2008 17:50:26 +0000 (19:50 +0200)
committerArne Fitzennreiter <arne_f@ipfire.org>
Mon, 20 Oct 2008 17:50:26 +0000 (19:50 +0200)

Trivial merge
IPFire 2.x development tree