From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 29 Aug 2014 15:38:33 +0000 (-0400)
Subject: Merge tag 'v1.42.12' into next
X-Git-Tag: v1.43-WIP-2015-05-18~210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b874d24629aa132d74a96134ec8eae4773a3c0ce;p=thirdparty%2Fe2fsprogs.git

Merge tag 'v1.42.12' into next

v1.42.12

Conflicts:
	version.h
---

b874d24629aa132d74a96134ec8eae4773a3c0ce
diff --cc version.h
index d7d0409f6,f937463df..d6d71d0c0
--- a/version.h
+++ b/version.h
@@@ -7,5 -7,5 +7,5 @@@
   * file may be redistributed under the GNU Public License v2.
   */
  
 -#define E2FSPROGS_VERSION "1.42.12"
 +#define E2FSPROGS_VERSION "1.43-WIP"
- #define E2FSPROGS_DATE "25-Aug-2014"
+ #define E2FSPROGS_DATE "29-Aug-2014"