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

[Matej Cepl]

commit d16adc929ddef342308548d0dad6db943bb21be7
Merge: 936061e 9f1bcdb
Author: Matěj Cepl <mcepl at cepl.eu>
Date:   Mon Feb 16 13:41:07 2015 +0100

    Merge branch 'master' into epel7
    
    Conflicts:
    	sources

 sources                          |    1 +
 youtube-dl-2015.02.11.tar.gz.sig |  Bin 0 -> 543 bytes
 2 files changed, 1 insertions(+), 0 deletions(-)
---