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

Merge branch 1.0-bugfix
---

b65308f0b9f038e8f56aebbee784d128be7b0f7e