From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Sat, 2 Oct 2010 18:31:20 +0000 (+0200)
Subject: Merge branch 'master' of git://git.videolan.org/vlc
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=314d91aaf1fcd5807caf3be7ab2c7da78751f837

Merge branch 'master' of git://git.videolan.org/vlc
---

314d91aaf1fcd5807caf3be7ab2c7da78751f837