Merge branch 'master' into f20

.gitignore

@@ -37,3 +37,5 @@
 /youtube-dl-2015.02.21.tar.gz.sig
 /youtube-dl-2015.03.03.1.tar.gz
 /youtube-dl-2015.03.03.1.tar.gz.sig
+/youtube-dl-2015.03.18.tar.gz
+/youtube-dl-2015.03.18.tar.gz.sig

sources

@@ -1,2 +1,2 @@
-17042c2b78c0250333d594e6f41a20c1  youtube-dl-2015.03.03.1.tar.gz
-82f28eea24fd899544743cc1cbcf9923  youtube-dl-2015.03.03.1.tar.gz.sig
+84170cf8ecb4d9734a9d26336b1784cf  youtube-dl-2015.03.18.tar.gz
+878582bcfb85ac4a0375ccaf226aa954  youtube-dl-2015.03.18.tar.gz.sig

youtube-dl.spec

@@ -1,5 +1,5 @@
 Name:           youtube-dl
-Version:        2015.03.03.1
+Version:        2015.03.18
 Release:        1%{?dist}
 Summary:        A small command-line program to download online videos
 License:        Public Domain
@@ -59,6 +59,9 @@ install -pm644 youtube-dl.zsh %{buildroot}%{_datadir}/zsh/site-functions/_youtub
 %{python_sitelib}/youtube_dl*.egg-info
 
 %changelog
+* Thu Mar 19 2015 Matej Cepl <mcepl@redhat.com> - 2015.03.18-1
+- Update to latest release (# 1201585)
+
 * Thu Mar 05 2015 Matej Cepl <mcepl@redhat.com> - 2015.03.03.1-1
 - Update to latest release (# 1195539, 1195779)