From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Wed, 29 Sep 2010 23:39:51 +0000 (+0200)
Subject: Merge branch 'master' of git://git.videolan.org/vlc
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=c21f9fb09f669d1777b2a8b177c9a7068af4f147

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

c21f9fb09f669d1777b2a8b177c9a7068af4f147