From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 23 Aug 2014 23:34:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=30b871b0ca09ae6088d8a8a0f77bf4d25aa0cb5b

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

30b871b0ca09ae6088d8a8a0f77bf4d25aa0cb5b