Merge remote-tracking branch 'remotes/Coacher/mpv-add-HTML-docs-to-documentation...
authorIan Delaney <idella4@gentoo.org>
Wed, 6 Jan 2016 18:03:07 +0000 (02:03 +0800)
committerIan Delaney <idella4@gentoo.org>
Wed, 6 Jan 2016 18:05:16 +0000 (02:05 +0800)
Pull request: https://github.com/gentoo/gentoo/pull/612


Trivial merge