]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Thu, 25 May 2017 17:55:23 +0000 (13:55 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 25 May 2017 17:55:23 +0000 (13:55 -0400)

Trivial merge