]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59627d2 7a1e1a9)
Merge remote-tracking branch 'stevee/pciutils'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Aug 2012 12:19:41 +0000 (14:19 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 5 Aug 2012 12:19:41 +0000 (14:19 +0200)

Trivial merge
Michael's tree of IPFire 3.x.