]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Tue, 16 Oct 2018 19:37:36 +0000 (15:37 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 16 Oct 2018 19:37:36 +0000 (15:37 -0400)

Trivial merge