Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 17 Jan 2012 14:52:53 +0000 (15:52 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 17 Jan 2012 14:52:53 +0000 (15:52 +0100)
commitf4298e61d0d9d2a87e8a43edd4aa7133455c5d7b
tree0389b0d4bdcb3f4c92e9bbbf5a2775576d56354a
parent0a9d201ca60b0922a1e822d7dbda478242ee257d
parent443114bf1b15790e0349a087a5673e4de25981ff
Merge branch 'maint'

* maint:
  fixup: contrib: really integrate in automake build system
Makefile.am
configure.ac