Merge branch 'master' into el6

Conflicts:
	sources
	youtube-dl.spec

.gitignore

@@ -43,3 +43,6 @@
 /youtube-dl-2013.11.19.tar.gz
 /youtube-dl-2013.11.20.tar.gz
 /youtube-dl-2013.11.22.2.tar.gz
+/youtube-dl-2013.11.25.3.tar.gz
+/youtube-dl-2013.11.29.tar.gz
+/youtube-dl-2013.12.02.tar.gz

sources

@@ -1 +1 @@
-5a03df2c239f3cd2ed9f6c0c64afdb40  youtube-dl-2013.11.29.tar.gz
+ad791992d0eb0a364d66d8478c4adde0  youtube-dl-2013.12.02.tar.gz

youtube-dl.spec

@@ -1,5 +1,5 @@
 Name:           youtube-dl
-Version:        2013.11.29
+Version:        2013.12.02
 Release:        1%{?dist}
 Summary:        A small command-line program to download online videos
 License:        Public Domain
@@ -37,8 +37,8 @@ install -pm644 %{S:1} %{buildroot}%{_sysconfdir}
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
-* Fri Nov 29 2013 Christopher Meng <rpm@cicku.me> - 2013.11.29-1
-- Update to new release(BZ#1035738).
+* Tue Dec 03 2013 Christopher Meng <rpm@cicku.me> - 2013.12.02-1
+- Update to new release.
 
 * Sun Nov 24 2013 Christopher Meng <rpm@cicku.me> - 2013.11.22.2-1
 - Update to new release.