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

[Christopher Meng]

commit 1089a863fc6a138da4b5b8ddcfb79261f2464e3c
Merge: bfe4b17 10b1b8d
Author: Christopher Meng <i at cicku.me>
Date:   Fri Feb 7 09:53:51 2014 +0800

    Merge branch 'master' into f19

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