VLC 2.1.0
Merge pull request #1085 from xtian/vlc-2.1.0

VLC 2.1.0