From: JP Dinger <jpd@videolan.org>
Date: Mon, 1 Feb 2010 00:57:41 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git@git.videolan.org/vlc
X-Git-Tag: 1.1.0-ff~578
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=cb9e605beef6ce4134bec22a90aa54746444e667;p=vlc

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

cb9e605beef6ce4134bec22a90aa54746444e667