Merge branch 'tg/next/1.0__add_subtitles' into tg/next/1.0
commitc6e0e2b28f8c1a0574f210edadc6e024681e92cb
authorToni Gundogdu <legatvs@gmail.com>
Tue, 15 Jan 2013 14:53:05 +0000 (15 16:53 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Tue, 15 Jan 2013 14:53:05 +0000 (15 16:53 +0200)
tree7816ccf2d47a49cf282efd41114227aac4e4a7ec
parenta0b0e593c78a0287943d14fa4d6b340fc822c73a
parent245b7ead8ebcd3ff0a78f2fb10337636edd88559
Merge branch 'tg/next/1.0__add_subtitles' into tg/next/1.0