Merge branch 'tg/next/1.0__man' into tg/next/1.0
commit9b0546a11063e6587745d1345c39524df87f1e16
authorToni Gundogdu <legatvs@gmail.com>
Mon, 25 Mar 2013 18:35:38 +0000 (25 20:35 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Mon, 25 Mar 2013 18:35:38 +0000 (25 20:35 +0200)
treeae800589bea8228fc07fcb353c8cbe6170d4bf8f
parentcb2816f1367ba54bec06c076b4acdbcc3b1f7382
parent5bbf9deafc1cb46a18168c613bcc5cf1ec0aac8a
Merge branch 'tg/next/1.0__man' into tg/next/1.0