From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Sat, 2 Oct 2010 00:19:09 +0000 (+0200)
Subject: Merge branch 'master' into lpcm_encoder
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=8e1671820b7e13c25028548cc7c9a41bc753dc09

Merge branch 'master' into lpcm_encoder
---

8e1671820b7e13c25028548cc7c9a41bc753dc09