From: Philipp Hagemeister <phihag@phihag.de>
Date: Fri, 22 Aug 2014 15:38:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=1a9ccac7c16acc52327959e1ef2eef7295fbe2b7;p=youtube-dl.git

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

1a9ccac7c16acc52327959e1ef2eef7295fbe2b7