Merge branch 'master' into config

* master:
  Add missing header to header list in dev.mk.in

Conflicts:
	dev.mk.in

diff --cc dev.mk.in
index f9b2f26d4484ee8bd4c782182c16d70647b35ba9,ebbc97516d7ea13d467be6bf705f7bc8c53fd342..af44c0dce1ed4be00337e0c448d95df6c8f0f2dd
--- 1/dev.mk.in
--- 2/dev.mk.in
+++ b/dev.mk.in
@@@ -26,7 -25,7 +26,7 @@@ built_dist_files = $(generated_docs
  headers = \
      ccache.h hashtable.h hashtable_itr.h hashtable_private.h hashutil.h \
      manifest.h mdfour.h counters.h murmurhashneutral2.h getopt_long.h \
-     language.h system.h compopt.h conf.h \
 -    language.h system.h compopt.h macroskip.h \
++    language.h system.h compopt.h macroskip.h conf.h \
      test/framework.h test/suites.h test/util.h
  
  files_to_clean += *.tar.bz2 *.tar.gz *.tar.xz *.xml .deps/*