From: Allan Zhou <allanzp@gmail.com>
Date: Wed, 21 Aug 2013 07:07:03 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=a3f62b8255120acda6d429d2a3ce53b13e871c5d;p=youtube-dl

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

a3f62b8255120acda6d429d2a3ce53b13e871c5d