Merge branch 'master' into branch-1.5
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 07:32:27 +0000 (01:32 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 07:32:27 +0000 (01:32 -0600)
1  2 
configure.ac

diff --cc configure.ac
Simple merge