From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 1 May 2013 12:05:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=5c01dd1e7374d1c84d19dab3e0172ee31a7f69e1;p=youtube-dl

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

5c01dd1e7374d1c84d19dab3e0172ee31a7f69e1