git: Merge branch 'vendor/MDOCML'

[Franco Fichtner]

commit 9e661f299d255ce61feb1a93c31de8a171cf1838
Merge: 127b4e0 7888c61
Author: Franco Fichtner <franco at lastsummer.de>
Date:   Tue Dec 31 14:38:23 2013 +0100

    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

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/9e661f299d255ce61feb1a93c31de8a171cf1838


-- 
DragonFly BSD source repository