Merge proposals dependent on lp:~videolan/vlc/2.1-manual

lp:~videolan/vlc/2.1-manual has no merge proposals.