From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 18 Feb 2013 17:47:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'glisignoli/master'
X-Git-Tag: 2013.02.18~10
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=79eb0287ab34767e72e77d612775789ff9da0422;p=youtube-dl.git

Merge remote-tracking branch 'glisignoli/master'
---

79eb0287ab34767e72e77d612775789ff9da0422