From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 3 Mar 2013 21:04:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'jcarlosgarciasegovia/master'
X-Git-Tag: 2013.03.29~23
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f2e237adc8493fbd186cdc4a92cedfa0801a7faf;p=youtube-dl.git

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

f2e237adc8493fbd186cdc4a92cedfa0801a7faf