Commit ebb37c17 authored by Moe Jette's avatar Moe Jette
Browse files

Merge remote branch 'origin/master'

Conflicts:
	NEWS
	auxdir/x_ac_munge.m4
parents d0150200 cbd2bda5
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment