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

[Christopher Meng]

commit 424e16c4e1308f021f68ae2fd5892c9ae3defa34
Merge: f995086 ec7c14f
Author: Christopher Meng <i at cicku.me>
Date:   Sun Dec 22 11:57:10 2013 +0800

    Merge branch 'master' into f19

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