]> 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: d2510bc d94eba7)
Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x
authorDirk Wagner <glotzi@ipfire.org>
Sat, 10 Jul 2010 10:41:05 +0000 (12:41 +0200)
committerDirk Wagner <glotzi@ipfire.org>
Sat, 10 Jul 2010 10:41:05 +0000 (12:41 +0200)

Trivial merge
Timo's tree of IPFire 2.x