Merge branch 'tg/next/1.0__asciidoc.conf' into tg/next/1.0
authorToni Gundogdu <legatvs@gmail.com>
Mon, 25 Mar 2013 21:10:36 +0000 (25 23:10 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Mon, 25 Mar 2013 21:10:36 +0000 (25 23:10 +0200)

Trivial merge