Merge branch 'maint'

Makefile

@@ -17,7 +17,6 @@ help helpall::
 	$(info )
 	$(info Getting Help)
 	$(info ============)
-	$(info )
 	$(info make help           - show brief help)
 	$(info make targets        - ditto)
 	$(info make helpall        - show extended help)

mk/server.mk

@@ -35,7 +35,7 @@ ORGFULL   = README COPYING lisp/ \
 		Makefile request-assign-future.txt \
 		mk/default.mk mk/targets.mk mk/version.mk \
 		mk/org-fixup.el \
-		etc/ contrib/ doc/
+		etc/ contrib/ doc/ testing/
 ORGFULL  := $(ORGFULL:%/=%/*)
 ORGELPA   = README_ELPA COPYING lisp/ \
 		doc/dir doc/org doc/orgcard.pdf \