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

[Christopher Meng]

commit ec8ae1c719e87efc7dd4199911deb5abcd17f04d
Merge: ce1ab23 978448b
Author: Christopher Meng <rpm at cicku.me>
Date:   Wed Sep 25 21:48:11 2013 +0800

    Merge branch 'master' into f19
    
    Conflicts:
    	sources

 .gitignore      |    1 +
 sources         |    2 +-
 youtube-dl.spec |    7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)
---