Merge branch 'subtitles_rework' (closes PR #1326)
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Wed, 11 Sep 2013 15:37:57 +0000 (17:37 +0200)
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Wed, 11 Sep 2013 15:41:24 +0000 (17:41 +0200)

Trivial merge