From: Steinar H. Gunderson <steinar+vlc@gunderson.no>
Date: Sun, 3 Oct 2010 12:58:06 +0000 (+0200)
Subject: Merge branch 'master' into lpcm_encoder
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=fe2fb5d35cfb033bbd1b3f2b588de34653677c2c

Merge branch 'master' into lpcm_encoder
---

fe2fb5d35cfb033bbd1b3f2b588de34653677c2c