From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Mon, 27 Sep 2010 21:55:39 +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=9cc1540b8c973407d32c013489e2e1277141ef1e

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

9cc1540b8c973407d32c013489e2e1277141ef1e