Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 30 Jul 2012 09:09:27 +0000 (11:09 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Mon, 30 Jul 2012 09:09:27 +0000 (11:09 +0200)
* maint:
  build: fix build in VPATH setup
  gen-tests: simplify sourcing of helper shell files

1  2 
Makefile.am

diff --cc Makefile.am
Simple merge