From: Philipp Hagemeister <phihag@phihag.de>
Date: Sat, 13 Sep 2014 04:00:50 +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=b734a87112f26f8977b1a1e76edf1bbff9452928

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

b734a87112f26f8977b1a1e76edf1bbff9452928