OSDN Git Service

Merge branch 'maint'
authorTheodore Ts'o <tytso@mit.edu>
Wed, 21 May 2008 20:56:42 +0000 (16:56 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 21 May 2008 20:56:42 +0000 (16:56 -0400)
commitc0af709e52dd4952d78f051ea5c082437ee3412b
treee6b07da8d129add939eedfa4139d267fbb7fa7c9
parenta16031c639c1965c7a35eb9ac9b2d45798efe7e9
parent491d8bc3e0fafda6cbb41e76549c620eb700f650
Merge branch 'maint'

Conflicts:

README
version.h
configure
configure.in
doc/libext2fs.texinfo
lib/blkid/probe.c