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