From: rupertbaxter2 <rupertbaxter2@yahoo.com>
Date: Sat, 16 Aug 2014 10:51:51 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=247a5da704d2b34ce855016fe8fb5861ba3ba6da;p=youtube-dl

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

247a5da704d2b34ce855016fe8fb5861ba3ba6da