Merge branch 'tg/next/1.0__asciidoc.conf' into tg/next/1.0
commit88047389d8b6a386706459fdb545258df71237fa
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)
tree04e2e529a62d66d8a30677a14105bb865fa83378
parent5ca84acbf6cca014aab9c1f15a745a35ebfd4d70
parent8f1bd598bc4be79cf5a908e152f79098eb0d7941
Merge branch 'tg/next/1.0__asciidoc.conf' into tg/next/1.0