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

[Matej Cepl]

commit b83a798dd8292bfcc803ee6482cfa69417231a38
Merge: 46d6485 43230b4
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Mar 17 00:08:50 2014 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore      |   53 +----------------------------------------------------
 sources         |    2 +-
 youtube-dl.spec |   38 +++++++++++++++++++++++++++++++++++++-
 3 files changed, 39 insertions(+), 54 deletions(-)
---