t00 - fifth line added
t00 - fifth line in doc-1.txt
t00 - tenth line in doc-1.txt
Merge branch 'master' into t01

Conflicts:
	code/doc-1.txt
	code/doc-2.txt
t01 - seventh line.