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)
commit542cca0e8c51ef7ad752911f5f671f1c72a87eb6
tree982ea4117182f86b5c29cf62d5d32147c0862482
parent6a2449df3b6604377a1ff516cbf4e25dff1d5f35
parent7fad1c6328b02ba9f23d37f374a05255abfe38a6
Merge branch 'subtitles_rework' (closes PR #1326)