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

[Christopher Meng]

commit 1afe1b1c50e2a07528e5d6766c265d0e5cf3732c
Merge: 1089a86 fef23fe
Author: Christopher Meng <i at cicku.me>
Date:   Tue Feb 11 08:12:11 2014 +0800

    Merge branch 'master' into f19

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