From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Fri, 1 Oct 2010 23:50:11 +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=c12acbd7d48431d7b5029d765e69e87378aca7a2

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

c12acbd7d48431d7b5029d765e69e87378aca7a2