Merge branch 'master' of ssh://github.com/doxygen/doxygen

Conflicts:
	doc/language.doc
	doc/translator_report.txt
	src/translator_cz.h
	src/translator_de.h
	src/translator_eo.h
	src/translator_es.h
	src/translator_gr.h
	src/translator_nl.h
	src/translator_ua.h