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

[Christopher Meng]

commit 8010103d492d68d3b11063317d1764da28eb2cb5
Merge: 8213465 b5eb2c1
Author: Christopher Meng <rpm at cicku.me>
Date:   Thu Nov 14 11:53:48 2013 +0800

    Merge branch 'master' into f19

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