From: Geoffroy Couprie <geo.couprie@gmail.com>
Date: Tue, 30 Sep 2008 10:08:41 +0000 (+0200)
Subject: Merge branch 'master' of git://git.videolan.org/vlc
X-Git-Tag: 1.0.0-pre1~2803
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=07faebaf35bfa682913ac99f11562ecd8b974021;p=vlc

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

07faebaf35bfa682913ac99f11562ecd8b974021