[youtube-dl/epel7: 3/3] Merge branch 'master' into epel7

[Matej Cepl]

commit e3e3a6018151a0e625ca508e249cc5de5e046b66
Merge: ac0a8f5 ae6d085
Author: Matěj Cepl <mcepl at cepl.eu>
Date:   Thu Mar 5 16:39:20 2015 +0100

    Merge branch 'master' into epel7

 .gitignore      | 4 ++++
 sources         | 4 ++--
 youtube-dl.spec | 8 +++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)
---