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

[Christopher Meng]

commit 4a3c8a3c38de41289134f17690730388e9d86817
Merge: 21b7acc b641ed3
Author: Christopher Meng <i at cicku.me>
Date:   Tue Feb 25 14:40:36 2014 +0800

    Merge branch 'master' into f19

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