commit a5ed87e7944deaea33914230e3d67ff08eb18382
author Stefano Lattarini <stefano.lattarini@gmail.com> Thu Feb 21 16:39:22 2013 +0100
committer Stefano Lattarini <stefano.lattarini@gmail.com> Thu Feb 21 16:39:22 2013 +0100
tree b09da2b8cea5cec35a17ea10b463d8e4c8cb06ad
parent 5e074aa5e14c7debc33f01ff9f40283278d06128
parent b4dbcb75f1c70d648c96dd0ec95aac6eaafecdef

Merge branch 'maint' into master

* maint:
  maint: more adjustments to the new versioning scheme
  aclocal: fix for more-than-once specified directories
  aclocal: just warn if the primary local m4 dir doesn't exist (don't error)
  coverage: expose automake bug#13760
  tests: refactor/enhance tests about make dry-run mode
  maint: describe new versioning and branching scheme, and adjust to it
  cosmetics: fix some "docstring-like" comments in automake

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>