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)
commit36a9f2e169edd3ecaac840f648d02c67bb1a3754
treee3d7b68689c43d9d572b7efbd0bd2da035d1870e
parent27a3747661d6a737f2cbc7441a271f7eea2f3499
parentea9e814dc5d1c142d006f60c575a0261f247e2b8
Merge branch 'master' into debian
configure.ac