]> 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 | compact (merge: 438bdd5 ff753a4)
Merge branch 'rspezial' of git://git.ipfire.org/ipfire-2.x into rspezial
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 May 2008 06:12:07 +0000 (08:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 May 2008 06:12:07 +0000 (08:12 +0200)

Trivial merge
Peter's tree of IPFire 2.x