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

[Matej Cepl]

commit ac0a8f5ea578d42d2994c29efbcdb6f9866f9789
Merge: d16adc9 9234726
Author: Matěj Cepl <mcepl at cepl.eu>
Date:   Wed Feb 18 15:05:49 2015 +0100

    Merge branch 'master' into epel7

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