Merge branch 'vendor/MDOCML'
authorFranco Fichtner <franco@lastsummer.de>
Sun, 6 Oct 2013 13:42:02 +0000 (15:42 +0200)
committerFranco Fichtner <franco@lastsummer.de>
Sun, 6 Oct 2013 13:42:02 +0000 (15:42 +0200)
Conflicts:
contrib/mdocml/mandoc.3
contrib/mdocml/mdoc_macro.c

1  2 
contrib/mdocml/mandoc.3

Simple merge