Merge pull request #4129 from MartijnKaijser/settings_subtitles
authorMartijn Kaijser <machine.sanctum@gmail.com>
Sun, 2 Feb 2014 10:35:04 +0000 (02:35 -0800)
committerMartijn Kaijser <machine.sanctum@gmail.com>
Sun, 2 Feb 2014 10:35:04 +0000 (02:35 -0800)
shuffle subtitle settings


Trivial merge