[youtube-dl/el6: 4/4] Merge branch 'master' into el6

[Christopher Meng]

commit 1eed670a35b9ef5e001a8fcd63a9f7a17985b7e1
Merge: d5ad9e3 ff76942
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Dec 3 16:52:06 2013 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	sources
    	youtube-dl.spec

 .gitignore      |    3 +++
 sources         |    2 +-
 youtube-dl.spec |    6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc youtube-dl.spec
index 40af030,45fac18..ac8b501
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@@ -37,9 -40,15 +37,9 @@@ install -pm644 %{S:1} %{buildroot}%{_sy
  %{_sysconfdir}/bash_completion.d/%{name}
  
  %changelog
- * Fri Nov 29 2013 Christopher Meng <rpm at cicku.me> - 2013.11.29-1
- - Update to new release(BZ#1035738).
+ * Tue Dec 03 2013 Christopher Meng <rpm at cicku.me> - 2013.12.02-1
+ - Update to new release.
  
 -* Fri Nov 29 2013 Christopher Meng <rpm at cicku.me> - 2013.11.29-1
 -- Update to new release(BZ#1035738).
 -
 -* Tue Nov 26 2013 Christopher Meng <rpm at cicku.me> - 2013.11.25.3-1
 -- Update to new release(BZ#1034138).
 -
  * Sun Nov 24 2013 Christopher Meng <rpm at cicku.me> - 2013.11.22.2-1
  - Update to new release.