From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Thu, 30 Sep 2010 23:27:56 +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=a695dfb6c3efa09be59778a8de46f5467ae92861

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

a695dfb6c3efa09be59778a8de46f5467ae92861