]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
projects / thirdparty / util-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdb8757 8c20c0a 376df2c)
Merge branch 'master', remote-tracking branch 'upstream/master' into sfdisk
authorSami Kerola <kerolasa@iki.fi>
Thu, 16 Jun 2011 19:44:24 +0000 (21:44 +0200)
committerSami Kerola <kerolasa@iki.fi>
Thu, 16 Jun 2011 19:44:24 +0000 (21:44 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.