Merge branch 'master' into el6

.gitignore

@@ -4,3 +4,4 @@
 /youtube-dl-2014.06.07.tar.gz
 /youtube-dl-2014.06.24.1.tar.gz
 /youtube-dl-2014.07.11.3.tar.gz
+/youtube-dl-2014.07.20.2.tar.gz

sources

@@ -1 +1 @@
-bf3d36ad1d9bc6fb20cf45a5f050221e  youtube-dl-2014.07.11.3.tar.gz
+39d65817d0cdc37d1d3dab7e6a7113bf  youtube-dl-2014.07.20.2.tar.gz

youtube-dl.spec

@@ -1,5 +1,5 @@
 Name:           youtube-dl
-Version:        2014.07.11.3
+Version:        2014.07.20.2
 Release:        1%{?dist}
 Summary:        A small command-line program to download online videos
 License:        Public Domain
@@ -37,6 +37,9 @@ install -pm644 %{S:1} %{buildroot}%{_sysconfdir}
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Mon Jul 21 2014 Matěj Cepl <mcepl@redhat.com> - 2014.07.20.2-1
+- Update to 2014.07.20.2
+
 * Sat Jul 12 2014 Christopher Meng <rpm@cicku.me> - 2014.07.11.3-1
 - Update to 2014.07.11.3