merge #12890: don't emit <p> tags in text mode when logdir specified.

author R David Murray <rdmurray@bitdance.com>

Sat, 27 Oct 2012 18:57:22 +0000 (14:57 -0400)

committer R David Murray <rdmurray@bitdance.com>

Sat, 27 Oct 2012 18:57:22 +0000 (14:57 -0400)
author R David Murray <rdmurray@bitdance.com>
Sat, 27 Oct 2012 18:57:22 +0000 (14:57 -0400)
committer R David Murray <rdmurray@bitdance.com>
Sat, 27 Oct 2012 18:57:22 +0000 (14:57 -0400)
diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
Simple merge
author	R David Murray <rdmurray@bitdance.com>
	Sat, 27 Oct 2012 18:57:22 +0000 (14:57 -0400)
committer	R David Murray <rdmurray@bitdance.com>
	Sat, 27 Oct 2012 18:57:22 +0000 (14:57 -0400)
		1	2
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history