From: JP Dinger Date: Fri, 24 Jul 2009 11:38:22 +0000 (+0200) Subject: Merge branch 'master' of git@git.videolan.org:vlc X-Git-Tag: 1.1.0-ff~4825 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bf8d85d77b6fc8c47704a0b787aca8ee8d72bb47;p=vlc Merge branch 'master' of git@git.videolan.org:vlc --- bf8d85d77b6fc8c47704a0b787aca8ee8d72bb47