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

[Christopher Meng]

commit 2c0daa99ccf72cbac45c1686fa1400791ace5b31
Merge: df8750d ce37fa2
Author: Christopher Meng <rpm at cicku.me>
Date:   Sat Oct 12 09:55:17 2013 +0800

    Merge branch 'master' into f19

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