Merge branch 'flickr' of github.com:remitamine/youtube-dl into remitamine-flickr
authorremitamine <remitamine@gmail.com>
Sun, 20 Dec 2015 23:37:51 +0000 (00:37 +0100)
committerremitamine <remitamine@gmail.com>
Sun, 20 Dec 2015 23:37:51 +0000 (00:37 +0100)

Trivial merge