Merge proposals dependent on lp:~neon/mplayerthumbs/master

lp:~neon/mplayerthumbs/master has no merge proposals.