Merge branch 'pr/1480'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 27 Feb 2016 18:19:54 +0000 (19:19 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 27 Feb 2016 18:19:54 +0000 (19:19 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge