Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Mon, 31 Jul 2017 21:13:32 +0000 (14:13 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Mon, 31 Jul 2017 21:13:32 +0000 (14:13 -0700)
1  2 
src/pgsql/Makefile.am
tests/check.scm

Simple merge
diff --cc tests/check.scm
Simple merge