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

[Christopher Meng]

commit c635da4972b2a96e34a804503a2ce638e7c1bc41
Merge: ffdfcaa dca5fb8
Author: Christopher Meng <rpm at cicku.me>
Date:   Fri Nov 29 11:49:42 2013 +0800

    Merge branch 'master' into f19

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