git: Merge branch 'vendor/MDOCML'

[Franco Fichtner]

commit 48ff368a8039fb3835a9cef5af5b06f3d4e83f93
Merge: 9daa987 f88b6c1
Author: Franco Fichtner <franco at lastsummer.de>
Date:   Sun Oct 6 15:42:02 2013 +0200

    Merge branch 'vendor/MDOCML'
    
    Conflicts:
    	contrib/mdocml/mandoc.3
    	contrib/mdocml/mdoc_macro.c

Summary of changes:

http://gitweb.dragonflybsd.org/dragonfly.git/commitdiff/48ff368a8039fb3835a9cef5af5b06f3d4e83f93


-- 
DragonFly BSD source repository