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

[Christopher Meng]

commit ddbfcbe36fb84915405b3adad237a812d76ff60a
Merge: 6d73efa 4ecef66
Author: Christopher Meng <rpm at cicku.me>
Date:   Mon Sep 9 07:40:28 2013 +0800

    Merge branch 'master' into f18

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