From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 31 May 2009 19:32:09 +0000 (+0300)
Subject: Merge branch 'master' of git@git.videolan.org:vlc
X-Git-Tag: 1.1.0-ff~5665
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3eeab0d3a064349bbd0f65b9a890a3cfc82f6283;p=vlc

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

3eeab0d3a064349bbd0f65b9a890a3cfc82f6283