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

[Christopher Meng]

commit bfe4b17215f10c3d467454683f16c2e2b8ac5101
Merge: e95445a 05f7f5a
Author: Christopher Meng <i at cicku.me>
Date:   Mon Jan 20 08:50:53 2014 +0800

    Merge branch 'master' into f19

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