K 10
svn:author
V 4
ngie
K 8
svn:date
V 27
2015-11-15T21:16:13.371963Z
K 7
svn:log
V 216
MFstable/10 r233422:

r233422 (by joel):

Remove superfluous paragraph macro.

Command used:
	$ svn merge --accept mine-conflict -c 233422 ^/stable/10

Conflicts:
	share/man/man4/netmap.4
	share/man/man9/locking.9 (

END