git: Merge branch 'vendor/MDOCML'

Mon Oct 27 15:10:19 PDT 2014

commit 4c72d8f557bf94c0676d37b731068ffd94993d5c
Merge: 426c810 070c62a
Author: Franco Fichtner <franco at lastsummer.de>
Date:   Mon Oct 27 23:40:16 2014 +0100

    Merge branch 'vendor/MDOCML'

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

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/4c72d8f557bf94c0676d37b731068ffd94993d5c

-- 
DragonFly BSD source repository