From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 5 Dec 2013 21:30:04 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=72135030d1235f608a2b5e0ec007ca8e6e19e3b4;p=youtube-dl

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

72135030d1235f608a2b5e0ec007ca8e6e19e3b4