]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Wed, 18 Oct 2017 15:32:18 +0000 (11:32 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 18 Oct 2017 15:32:18 +0000 (11:32 -0400)

Trivial merge