From: Philipp Hagemeister <phihag@phihag.de>
Date: Tue, 27 Nov 2012 13:55:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'chrisjrn/master'
X-Git-Tag: 2012.11.28~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fa59f4b6a9df03d1156dd2d274295a7b3d75c059;p=youtube-dl.git

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

fa59f4b6a9df03d1156dd2d274295a7b3d75c059