From: rupertbaxter2 <rupertbaxter2@yahoo.com>
Date: Tue, 19 Aug 2014 14:15:33 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=ca7a9c1bf7c57d1a5da9a24dd7618d95cb93102a;p=youtube-dl.git

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

ca7a9c1bf7c57d1a5da9a24dd7618d95cb93102a