Merge branch 'vendor/MDOCML'
authorFranco Fichtner <franco@lastsummer.de>
Mon, 27 Oct 2014 22:40:16 +0000 (23:40 +0100)
committerFranco Fichtner <franco@lastsummer.de>
Mon, 27 Oct 2014 22:40:16 +0000 (23:40 +0100)
commit4c72d8f557bf94c0676d37b731068ffd94993d5c
tree8e46078b1694d704b4995fd7f6b24ee0aae2bf77
parent426c810e860ef6d74d41b4c4a87e4b5772a8ce36
parent070c62a6080f3739784759f6f1802a88928443ae
Merge branch 'vendor/MDOCML'

Conflicts:
contrib/mdocml/Makefile
contrib/mdocml/mandoc.h
contrib/mdocml/mdoc_validate.c
contrib/mdocml/read.c
contrib/mdocml/Makefile
contrib/mdocml/lib.in