From: remitamine <remitamine@gmail.com>
Date: Sun, 20 Dec 2015 23:37:51 +0000 (+0100)
Subject: Merge branch 'flickr' of github.com:remitamine/youtube-dl into remitamine-flickr
X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=b9a324c0daafb9484a2575783b6b120a7de885ff;p=youtube-dl

Merge branch 'flickr' of github.com:remitamine/youtube-dl into remitamine-flickr
---

b9a324c0daafb9484a2575783b6b120a7de885ff