Merge branch 'dog-feeding' into maint
authorStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 10 May 2013 11:31:59 +0000 (13:31 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 10 May 2013 11:31:59 +0000 (13:31 +0200)
* dog-feeding:
  build: move automake and aclocal in 'bin' subdir
  build: break up monolithic Makefile.am in subdir-specific fragments

1  2 
bin/automake.in

diff --cc bin/automake.in
Simple merge