From: megustamucho <megustamucho@users.noreply.github.com>
Date: Sat, 20 Sep 2014 12:41:45 +0000 (+1000)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=youtube-dl;a=commitdiff_plain;h=34e14a9beb3abe76bcda1154030978979c6c1d1d

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

34e14a9beb3abe76bcda1154030978979c6c1d1d