From: Steinar Gunderson <sgunderson@bigfoot.com>
Date: Sat, 25 Sep 2010 22:45:43 +0000 (+0200)
Subject: Merge branch 'master' of git://git.videolan.org/vlc
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=55b7b5bdb7e65e94465d4ff5660cfc2964d7a18f;p=vlc

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

55b7b5bdb7e65e94465d4ff5660cfc2964d7a18f