Merge branch 'maint' into branch-1.11
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 18 Jan 2012 12:44:56 +0000 (13:44 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 18 Jan 2012 12:44:56 +0000 (13:44 +0100)
commit23a9b4365b641e02a61b95b1d84a5c5068c44830
treeb39ad2180fcba22d592881c509db0b200155faed
parent693557ce7fcd728fa9e7b5d60713b4caefc39e78
parenta1e77caf20a62b14d549307a73131fedb9c0f696
Merge branch 'maint' into branch-1.11

* maint:
  cosmetics: move CheckListOfTests.am into tests/
  tests: move all under the same hierarchy ('tests/' directory)
  gitlog-to-changelog: update from upstream
  changelog: don't cluster multiple entries under the same "date line"
  fixup: contrib: really integrate in automake build system
  contrib: new, a directory for non-mainstream functionalities
configure.ac
tests/Makefile.am
tests/list-of-tests.mk