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

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

5af7e056a746ad9d0dbfd82470fb216addaf9dbd