commit a5ed87e7944deaea33914230e3d67ff08eb18382 Merge: 5e074aa b4dbcb7 Author: Stefano Lattarini <stefano.lattar...@gmail.com> Date: Thu Feb 21 16:39:22 2013 +0100
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.lattar...@gmail.com>