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

[Christopher Meng]

commit b2c42452d0b6aeed53b9f124f6f0e24b5d4542b3
Merge: 7459d33 ff76942
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Dec 3 16:50:49 2013 +0800

    Merge branch 'master' into f18

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