projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b492e2 ea2b3bf)
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Jun 2011 16:09:03 +0000 (18:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Jun 2011 16:09:03 +0000 (18:09 +0200)

Trivial merge
Peter's tree of IPFire 2.x