Merge branch 'vendor/MDOCML'
authorSascha Wildner <saw@online.de>
Mon, 15 Apr 2013 20:19:59 +0000 (22:19 +0200)
committerSascha Wildner <saw@online.de>
Mon, 15 Apr 2013 20:19:59 +0000 (22:19 +0200)

Trivial merge