From: rupertbaxter2 <rupertbaxter2@yahoo.com>
Date: Tue, 5 Aug 2014 19:43:30 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f9f86b0c645ebef9e68d27086d565eb3c057478f;p=youtube-dl

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

f9f86b0c645ebef9e68d27086d565eb3c057478f