From: rupertbaxter2 <rupertbaxter2@yahoo.com>
Date: Sun, 3 Aug 2014 22:23:01 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=0aed8df2bf12c9e41f1cae7545f1e8379763cbf9;p=youtube-dl

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

0aed8df2bf12c9e41f1cae7545f1e8379763cbf9