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)
commit48ff368a8039fb3835a9cef5af5b06f3d4e83f93
tree7a659607fd9bab19a4ece921884ff589fcdffc28
parent9daa987e4091b1e4d4f5cf7a60898c56dd05c8cc
parentf88b6c166601db65e30d49d360aeb63cd0a021ea
Merge branch 'vendor/MDOCML'

Conflicts:
contrib/mdocml/mandoc.3
contrib/mdocml/mdoc_macro.c
contrib/mdocml/mandoc.3