]> 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: d58d68b 29f1189)
Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x v2.9-beta1
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 Dec 2010 20:03:12 +0000 (21:03 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 Dec 2010 20:03:12 +0000 (21:03 +0100)

Trivial merge
Peter's tree of IPFire 2.x