From: Philipp Hagemeister <phihag@phihag.de>
Date: Mon, 23 Dec 2013 12:52:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=00b2685b9ceecbeb5a5ea1cb7bd1ff2772e941de;p=youtube-dl

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

00b2685b9ceecbeb5a5ea1cb7bd1ff2772e941de