videolan/vlc — pull request #21 by flx42 (2014-12-23 18:59:17+00:00)
Title: Merge pull request #1 from videolan/master

Merge