tree d565085e02420406b014f3b18091901cfa5d9cb0
parent 8467b3bec8bb35d5afd0370b2d2a2703e33dd686
parent 160f131deed7d3db2aa958051eef7ae8fafa8539
author Theodore Ts'o <tytso@mit.edu> 1415118009 -0500
committer Theodore Ts'o <tytso@mit.edu> 1415118009 -0500

Merge branch 'maint' into next

Conflicts:
	configure