]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Sun, 21 Oct 2018 11:53:16 +0000 (07:53 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 21 Oct 2018 11:53:16 +0000 (07:53 -0400)

Trivial merge