Automated merge

rename test directory to avoid name clash with Makefile target

(0) -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 tip

mercurial