From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Sat, 2 Oct 2010 09:47:21 +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=98dede2c4cb2a8283290147606c257f9d37145f5

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

98dede2c4cb2a8283290147606c257f9d37145f5