]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0834a12 ff0378a)
Merge branch 'master' of ssh://stevee@git.ipfire.org/pub/git/ipfire-3.x
authorStefan Schantl <Stevee@ipfire.org>
Tue, 4 Aug 2009 20:57:00 +0000 (22:57 +0200)
committerStefan Schantl <Stevee@ipfire.org>
Tue, 4 Aug 2009 20:57:00 +0000 (22:57 +0200)

Trivial merge
IPFire 3.x development tree