tree 9f7744a16cb6aab5073e6a27f43c017b0fc9df21
parent 5543f45eeaebfdeb1301146eb90ffcecbae527ba
parent bf140bf29866991a3711688a5182fc5b1ae7c7cd
author Theodore Ts'o <tytso@mit.edu> 1407031503 -0400
committer Theodore Ts'o <tytso@mit.edu> 1407031503 -0400

Merge branch 'maint' into next

Conflicts:
	configure
	misc/Makefile.in