From: Franco Fichtner <franco@lastsummer.de>
Date: Tue, 31 Dec 2013 13:38:23 +0000 (+0100)
Subject: Merge branch 'vendor/MDOCML'
X-Git-Tag: v3.9.0~908
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/9e661f299d255ce61feb1a93c31de8a171cf1838

Merge branch 'vendor/MDOCML'

Conflicts:
	contrib/mdocml/index.sgml
	contrib/mdocml/lib.in
	contrib/mdocml/mandoc.3
	contrib/mdocml/mandoc.c
	contrib/mdocml/mandoc.h
	contrib/mdocml/mdoc.7
	contrib/mdocml/roff.c
---

9e661f299d255ce61feb1a93c31de8a171cf1838