Merge branch 'master' into f20

.gitignore

@@ -6,3 +6,4 @@
 /youtube-dl-2014.07.11.3.tar.gz
 /youtube-dl-2014.07.20.2.tar.gz
 /youtube-dl-2014.07.25.1.tar.gz
+/youtube-dl-2014.08.29.tar.gz

sources

@@ -1 +1 @@
-46d8f46c93afbaf4eace5bec3e588727  youtube-dl-2014.07.25.1.tar.gz
+538f53cc3ab7c08f7a5f7a730833b14e  youtube-dl-2014.08.29.tar.gz

youtube-dl.spec

@@ -1,5 +1,5 @@
 Name:           youtube-dl
-Version:        2014.07.25.1
+Version:        2014.08.29
 Release:        1%{?dist}
 Summary:        A small command-line program to download online videos
 License:        Public Domain
@@ -39,6 +39,9 @@ install -pm644 %{S:1} %{buildroot}%{_sysconfdir}
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Sun Aug 31 2014 Till Maas <opensource@till.name> - 2014.08.29-1
+- Update to 2014.08.29
+
 * Tue Jul 29 2014 Christopher Meng <rpm@cicku.me> - 2014.07.25.1-1
 - Update to 2014.07.25.1