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

[Christopher Meng]

commit 66167f5bfed4bf7ea970842688753a17a8c3f6cc
Merge: 0afaeaa 83cfdf8
Author: Christopher Meng <i at cicku.me>
Date:   Sat Jul 12 22:01:49 2014 +0800

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

 .gitignore      |    4 ++++
 sources         |    2 +-
 youtube-dl.spec |    7 +++++--
 3 files changed, 10 insertions(+), 3 deletions(-)
---
diff --cc youtube-dl.spec
index 577ac2a,9a58eab..f79377d
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@@ -37,6 -39,21 +37,9 @@@ install -pm644 %{S:1} %{buildroot}%{_sy
  %{_sysconfdir}/bash_completion.d/%{name}
  
  %changelog
+ * Sat Jul 12 2014 Christopher Meng <rpm at cicku.me> - 2014.07.11.3-1
+ - Update to 2014.07.11.3
+ 
 -* Tue Jun 24 2014 Christopher Meng <rpm at cicku.me> - 2014.06.24.1-1
 -- Update to 2014.06.24.1
 -
 -* Mon Jun 09 2014 Christopher Meng <rpm at cicku.me> - 2014.06.07-1
 -- Update to 2014.06.07
 -
 -* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2014.05.05-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 -
 -* Tue May 06 2014 Christopher Meng <rpm at cicku.me> - 2014.05.05-1
 -- Update to 2014.05.05
 -
  * Fri Apr 11 2014 Christopher Meng <rpm at cicku.me> - 2014.04.11.1-1
  - Update to 2014.04.11.1