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

[Christopher Meng]

commit dfaa5c32007c8271307b67e9b0bf42102764b850
Merge: dfe9782 801bd70
Author: Christopher Meng <rpm at cicku.me>
Date:   Sun Oct 20 10:14:54 2013 +0800

    Merge branch 'master' into f19

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