From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 12 Jan 2013 13:04:30 +0000 (+0100)
Subject: Merge 'jaimeMF/videoconversion' (sans actual option for now)
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=d81edc573e35cb5502f2b5e52323b980600c0c8b;p=youtube-dl

Merge 'jaimeMF/videoconversion' (sans actual option for now)
---

d81edc573e35cb5502f2b5e52323b980600c0c8b