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

[Christopher Meng]

commit ffdfcaa4a71664610ceadd13f682635a1222301d
Merge: 601b8de e7d3f3a
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Nov 26 09:30:26 2013 +0800

    Merge branch 'master' into f19

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