Merge branch 'master' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 20 May 2014 01:25:45 +0000 (21:25 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 20 May 2014 01:25:45 +0000 (21:25 -0400)
1  2 
configure.ac

diff --cc configure.ac
Simple merge