Whamcloud - gitweb
Merge branch 'maint'
authorTheodore Ts'o <tytso@mit.edu>
Tue, 22 Apr 2008 01:35:44 +0000 (21:35 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 22 Apr 2008 01:35:44 +0000 (21:35 -0400)
commit4476105bf377eb9bd30d2771b21b2ada06c13e82
tree28ac048c4f403454becf691e0d5fb31196c0d5d0
parent5711ed297b1a3d94086256b5b3b891d4f77b21ca
parent748d07118cb8ba7c80e29e7cb8d865999bc7c255
Merge branch 'maint'

Conflicts:

configure
configure
configure.in
doc/libext2fs.texinfo
lib/blkid/probe.c