From: Franco Fichtner <franco@lastsummer.de>
Date: Sun, 6 Oct 2013 13:42:02 +0000 (+0200)
Subject: Merge branch 'vendor/MDOCML'
X-Git-Tag: v3.6.0rc~220
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/48ff368a8039fb3835a9cef5af5b06f3d4e83f93

Merge branch 'vendor/MDOCML'

Conflicts:
	contrib/mdocml/mandoc.3
	contrib/mdocml/mdoc_macro.c
---

48ff368a8039fb3835a9cef5af5b06f3d4e83f93