From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 19 Aug 2012 22:11:46 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42.5.wc2^2
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=f6f359e7e6a5700f71e640b9dd4e409ea32b6d52;p=tools%2Fe2fsprogs.git

Merge branch 'maint' into next
---

f6f359e7e6a5700f71e640b9dd4e409ea32b6d52