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

[Till Maas]

commit 952233144518548045b6dabd7460acdf7617cb9d
Merge: cbf075f 002d25d
Author: Till Maas <opensource at till.name>
Date:   Tue Sep 23 21:41:04 2014 +0200

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

 .gitignore      |    4 ++++
 sources         |    3 ++-
 youtube-dl.spec |   13 ++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 6594a2f,7128ee2..2d2f4a0
--- a/.gitignore
+++ b/.gitignore
@@@ -7,3 -7,7 +7,7 @@@
  /youtube-dl-2014.07.20.2.tar.gz
  /youtube-dl-2014.07.25.1.tar.gz
  /youtube-dl-2014.08.29.tar.gz
 -/youtube-dl-2014.09.06.tar.gz.sig
+ /youtube-dl-2014.09.06.tar.gz
++/youtube-dl-2014.09.06.tar.gz.sig
+ /youtube-dl-2014.09.22.1.tar.gz
+ /youtube-dl-2014.09.22.1.tar.gz.sig