]> 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: 74210e0 53a9266)
Merge remote-tracking branch 'stevee/blkid-devel'
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Oct 2012 13:05:50 +0000 (13:05 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 8 Oct 2012 13:05:50 +0000 (13:05 +0000)

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