From: Jean-Baptiste Kempf Date: Sun, 29 Mar 2009 17:23:14 +0000 (+0200) Subject: Merge branch 'master' of git@git.videolan.org:vlc X-Git-Tag: 1.0.0-pre2~328 X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=1c56e0ed3e363aa8c581c7e2880ac3e9bc51c674 Merge branch 'master' of git@git.videolan.org:vlc --- 1c56e0ed3e363aa8c581c7e2880ac3e9bc51c674