From: Allan Zhou <allanzp@gmail.com>
Date: Sat, 31 Aug 2013 00:51:59 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=85f03346ebe38c0b4cd46ab64bf9b5825d12895a

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

85f03346ebe38c0b4cd46ab64bf9b5825d12895a