From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 3 Sep 2012 03:32:14 +0000 (-0400)
Subject: Merge branch 'next'
X-Git-Tag: v1.42.5.wc2
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=19dcd5cce464e583bc72846ad8bb32fcf6be307a;p=tools%2Fe2fsprogs.git

Merge branch 'next'
---

19dcd5cce464e583bc72846ad8bb32fcf6be307a