Merge branch 'vendor/MDOCML'
authorFranco Fichtner <franco@lastsummer.de>
Tue, 31 Dec 2013 13:38:23 +0000 (14:38 +0100)
committerFranco Fichtner <franco@lastsummer.de>
Tue, 31 Dec 2013 13:38:23 +0000 (14:38 +0100)
commit9e661f299d255ce61feb1a93c31de8a171cf1838
tree2322065d5ba41b583c37ed72ed71cfb05cb070a2
parent127b4e0b07c21e1f9bb4ff209fae34dc2ce1e2d6
parent7888c61dff98863e32d422643f7b1a9e532310f5
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
contrib/mdocml/Makefile
contrib/mdocml/lib.in
contrib/mdocml/mandoc.c
contrib/mdocml/mandoc.h