From: rupertbaxter2 <rupertbaxter2@yahoo.com>
Date: Wed, 13 Aug 2014 23:07:58 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=74dcf42a85b5c618aebc7c5d0a1b4f46de259595;p=youtube-dl

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

74dcf42a85b5c618aebc7c5d0a1b4f46de259595