OSDN Git Service

Merge branch 'master' of https://github.com/danielnorberg/e2fsprogs into maint
authorTheodore Ts'o <tytso@mit.edu>
Tue, 10 Apr 2012 17:10:44 +0000 (13:10 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 10 Apr 2012 17:16:29 +0000 (13:16 -0400)
commit2743499061f96a2c16fe597102f5c8ba2d7f1ebe
tree3981611eebab22e0634f6cc2a5ef10bb5299590a
parentf52c1753d41cfb02779ead0afea48ec2c1c8ed57
parentf6243c10db64ae46beb6a90fccf771f9c9f3d2f8
Merge branch 'master' of https://github.com/danielnorberg/e2fsprogs into maint

(The single commit was missing a Signed-Off-By, but it was a trivial
change to a non-source file, so I've accepted it.)

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>