From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Thu, 30 Sep 2010 21:31:14 +0000 (+0200)
Subject: Merge branch 'master' into lpcm_encoder
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=42f0232b694ea4ef13b3ffb68935bf0297c7105b

Merge branch 'master' into lpcm_encoder
---

42f0232b694ea4ef13b3ffb68935bf0297c7105b