]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e552055 4cdac3e)
Merge branch 'master' of ssh://peterman@people.ipfire.org/pub/git/ipfire-2.x
authorPeter Pfeiffer <peterman@ipfire.org>
Fri, 22 May 2009 17:52:41 +0000 (19:52 +0200)
committerPeter Pfeiffer <peterman@ipfire.org>
Fri, 22 May 2009 17:52:41 +0000 (19:52 +0200)

Trivial merge
Timo's tree of IPFire 2.x