From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 23 Nov 2014 21:10:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'jtwaleson/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=27f8b0994e9924724c974f46435552d401f5fc08;p=youtube-dl

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

27f8b0994e9924724c974f46435552d401f5fc08