projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d19b781 708a519)
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 30 Jul 2009 13:54:38 +0000 (15:54 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 30 Jul 2009 13:54:38 +0000 (15:54 +0200)

Trivial merge
Peter's tree of IPFire 2.x