]> 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: ef92b64 585893a)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Dec 2008 17:17:23 +0000 (18:17 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 18 Dec 2008 17:17:23 +0000 (18:17 +0100)

Trivial merge
Peter's tree of IPFire 2.x