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

[Christopher Meng]

commit a5b8dec2d9075db61988c50139c91626dcf7eaf0
Merge: a0cb61b 10b1b8d
Author: Christopher Meng <i at cicku.me>
Date:   Fri Feb 7 09:53:59 2014 +0800

    Merge branch 'master' into f18

 .gitignore      |    4 ++++
 sources         |    2 +-
 youtube-dl.spec |   14 +++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)
---