Merge remote-tracking branch 'origin/master' into debian
authorSam Hartman <hartmans@debian.org>
Wed, 25 Mar 2015 04:58:31 +0000 (00:58 -0400)
committerSam Hartman <hartmans@debian.org>
Wed, 25 Mar 2015 04:58:31 +0000 (00:58 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge