Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 2 Jun 2017 15:39:39 +0000 (17:39 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 2 Jun 2017 15:39:39 +0000 (17:39 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge