mpv-player/mpv — pull request #292 by mathstuf (2013-10-14 23:33:10+00:00)
Title: dev/account-for-join diff

Addresses #278. Based on #258 (can be merged with it if wanted).