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

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

b4e60dac233c791e53281bea4014354b8280421e