]> 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: dbf85d6 7d7238b)
Merge branch 'master' of ssh://commander1024@git.ipfire.org/pub/git/ipfire-2.x
authorMarcus Scholz <commander1024@ipfire.org>
Thu, 22 Oct 2009 18:04:56 +0000 (20:04 +0200)
committerMarcus Scholz <commander1024@ipfire.org>
Thu, 22 Oct 2009 18:04:56 +0000 (20:04 +0200)

Trivial merge
Timo's tree of IPFire 2.x