Merge branch 'master' of https://github.com/groleo/doxygen

Conflicts:
	addon/doxywizard/doxywizard.ico
time
Merge branch 'master' of https://github.com/groleo/doxygen