Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Tue, 4 Nov 2014 16:20:09 +0000 (11:20 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 4 Nov 2014 16:20:09 +0000 (11:20 -0500)
commit8b779489eae0434c128101deb19f0e053dd88940
treed565085e02420406b014f3b18091901cfa5d9cb0
parent8467b3bec8bb35d5afd0370b2d2a2703e33dd686
parent160f131deed7d3db2aa958051eef7ae8fafa8539
Merge branch 'maint' into next

Conflicts:
configure
configure
configure.in
lib/config.h.in
lib/ext2fs/ext3_extents.h
misc/mke2fs.8.in
util/subst.c