Merge remote-tracking branch 'remotes/sbraz/pysrt'
authorIan Delaney <idella4@gentoo.org>
Tue, 2 Feb 2016 12:42:46 +0000 (20:42 +0800)
committerIan Delaney <idella4@gentoo.org>
Tue, 2 Feb 2016 12:42:46 +0000 (20:42 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/762


Trivial merge