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

[Christopher Meng]

commit d7259723baf3b02fd2f48af5ae90743820d2f5c0
Merge: 8c5c100 ed60249
Author: Christopher Meng <rpm at cicku.me>
Date:   Fri Nov 8 18:22:15 2013 +0800

    Merge branch 'master' into el6

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