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

Merge branch 'master' into lpcm_encoder
---

ddb6257679fb78c14c9fc4b28dcdd558af98903e