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

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

0c72eb9060c3f6e20fb9a53be93d256b6947fd65