From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 29 Nov 2012 17:14:43 +0000 (+0100)
Subject: Merge branch 'master' of github.com:rg3/youtube-dl
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=3c5b63d2d68d4079285d5ff074e7454ca2df60c6;hp=3c5b63d2d68d4079285d5ff074e7454ca2df60c6;p=youtube-dl

Merge branch 'master' of github.com:rg3/youtube-dl
---