Merge branch 'master' into f20

.gitignore

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

sources

@@ -1 +1 @@
-39d65817d0cdc37d1d3dab7e6a7113bf  youtube-dl-2014.07.20.2.tar.gz
+46d8f46c93afbaf4eace5bec3e588727  youtube-dl-2014.07.25.1.tar.gz

youtube-dl.spec

@@ -1,5 +1,5 @@
 Name:           youtube-dl
-Version:        2014.07.20.2
+Version:        2014.07.25.1
 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
+* Tue Jul 29 2014 Christopher Meng <rpm@cicku.me> - 2014.07.25.1-1
+- Update to 2014.07.25.1
+
 * Mon Jul 21 2014 Matěj Cepl <mcepl@redhat.com> - 2014.07.20.2-1
 - Update to 2014.07.20.2