Adde for developer conflict check
Merge branch 'master' of https://github.com/Sadashiv/apache

Conflicts:
	TL/1.rst