From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 16 Jun 2015 03:16:24 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43-WIP-2016-03-15~93
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=dc810decfa3724fba59548eaf8efd75ec3291d60;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next
---

dc810decfa3724fba59548eaf8efd75ec3291d60