From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 13 May 2009 18:08:54 +0000 (+0300)
Subject: Merge branch 1.0-bugfix
X-Git-Tag: 1.1.0-ff~6000
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9c1f8ba149532713c7912eb233409b283c150155;p=vlc

Merge branch 1.0-bugfix
---

9c1f8ba149532713c7912eb233409b283c150155