From: Allan Zhou <allanzp@gmail.com>
Date: Tue, 20 Aug 2013 00:11:52 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=90d3989b99c7a9446089ea635ca288216625d44c;p=youtube-dl

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

90d3989b99c7a9446089ea635ca288216625d44c