From: Philipp Hagemeister <phihag@phihag.de>
Date: Wed, 30 Apr 2014 12:12:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=0c13f378de5f77c31a7df6d6deaec990bd3379d9;p=youtube-dl

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

0c13f378de5f77c31a7df6d6deaec990bd3379d9