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

[Christopher Meng]

commit 6f0a721602a9ff8a2476b9a9e4c9b0bedde99590
Merge: 805ff5f a0157ca
Author: Christopher Meng <i at cicku.me>
Date:   Tue Dec 10 15:28:00 2013 +0800

    Merge branch 'master' into f19

 .gitignore      |    1 +
 sources         |    2 +-
 youtube-dl.spec |   93 ++++++++++++++++++++++++++++--------------------------
 3 files changed, 50 insertions(+), 46 deletions(-)
---