From: Allan Zhou <allanzp@gmail.com>
Date: Fri, 23 Aug 2013 22:33:36 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=39c6f507df5f69e5d9b41b054205ec310f6427a5;hp=-c;p=youtube-dl

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

39c6f507df5f69e5d9b41b054205ec310f6427a5