]> 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: 156bfbb 70db6c7)
Merge branch 'master', remote-tracking branch 'upstream/master'
authorSami Kerola <kerolasa@iki.fi>
Mon, 20 Jun 2011 17:54:39 +0000 (19:54 +0200)
committerSami Kerola <kerolasa@iki.fi>
Mon, 20 Jun 2011 17:54:39 +0000 (19:54 +0200)

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