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

[Christopher Meng]

commit c4442cbb55ccc18fb006a20f3abf06d8b76ab965
Merge: 723fafb 9819260
Author: Christopher Meng <rpm at cicku.me>
Date:   Mon Jul 22 10:40:31 2013 +0800

    Merge branch 'master' into f18

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