]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 52c2987 fdeaa05)
Merge branch 'master' of ssh://glotzi@git.ipfire.org/pub/git/ipfire-2.x
authorDirk Wagner <glotzi@ipfire.org>
Fri, 16 Apr 2010 19:25:00 +0000 (21:25 +0200)
committerDirk Wagner <glotzi@ipfire.org>
Fri, 16 Apr 2010 19:25:00 +0000 (21:25 +0200)

Trivial merge
Peter's tree of IPFire 2.x