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

[Christopher Meng]

commit eb45f05d75bc7ae17d77ebd065aad650a692e369
Merge: c635da4 ff76942
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Dec 3 16:50:46 2013 +0800

    Merge branch 'master' into f19

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