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

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

d1b4617e1d5dd055810a309332a33757ecc8ef9d