From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 31 May 2009 19:30:31 +0000 (+0300)
Subject: Merge commit 'origin/base'
X-Git-Tag: 1.1.0-ff~5665^2
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b;p=vlc

Merge commit 'origin/base'
---

4b44912ce0888ed40d35aa5d782cd17cbf7e9c6b