From: Allan Zhou <allanzp@gmail.com>
Date: Wed, 28 Aug 2013 17:19:28 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=483e0ddd4da561939a592aecf19f6f9c80eb2d0a;p=youtube-dl

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

483e0ddd4da561939a592aecf19f6f9c80eb2d0a