Merge branch 'master' into f20

.gitignore

@@ -45,3 +45,5 @@
 /youtube-dl-2015.04.28.tar.gz.sig
 /youtube-dl-2015.05.10.tar.gz
 /youtube-dl-2015.05.10.tar.gz.sig
+/youtube-dl-2015.06.04.1.tar.gz
+/youtube-dl-2015.06.04.1.tar.gz.sig

sources

@@ -1,2 +1,2 @@
-214ed869da7a442f8faadb463339a645  youtube-dl-2015.05.10.tar.gz
-c41b63b78accea9ee02ca04bfbd9c434  youtube-dl-2015.05.10.tar.gz.sig
+7e6fab7bfd246c8a414ca368edf81394  youtube-dl-2015.06.04.1.tar.gz
+c267c40a9cd1a1487f3bfc0aaca4150d  youtube-dl-2015.06.04.1.tar.gz.sig

youtube-dl.spec

@@ -1,5 +1,5 @@
 Name:           youtube-dl
-Version:        2015.05.10
+Version:        2015.06.04.1
 Release:        1%{?dist}
 Summary:        A small command-line program to download online videos
 License:        Public Domain
@@ -66,6 +66,9 @@ install -pm644 youtube-dl.zsh %{buildroot}%{_datadir}/zsh/site-functions/_youtub
 
 
 %changelog
+* Fri Jun 05 2015 Matej Cepl <mcepl@redhat.com> - 2015.06.04.1-1
+- Update to the latest release (#1222017)
+
 * Fri May 15 2015 Matej Cepl <mcepl@redhat.com> - 2015.05.10-1
 - Update to the latest release (#1218015, 1200569, 1206484)