Merge branch 'tg/next/1.0_add_main.dp.in' into tg/next/1.0
commitdc82e0ecc00cf2c7e61c589544927e35de9189ff
authorToni Gundogdu <legatvs@gmail.com>
Sat, 18 Aug 2012 20:30:13 +0000 (18 23:30 +0300)
committerToni Gundogdu <legatvs@gmail.com>
Sat, 18 Aug 2012 20:30:13 +0000 (18 23:30 +0300)
tree9fefbc3ae0575bbee1b2cbb48d645df9dd72c8b6
parentbe6c7f6c5a4434462afaec20ec3d9edf707454de
parent53eb29ad9b5b50da8a27e2147d214409018453aa
Merge branch 'tg/next/1.0_add_main.dp.in' into tg/next/1.0