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

[Christopher Meng]

commit b99536648207eb31849800e1a7d3eb4a03a49be6
Merge: cd1a66e f54e41a
Author: Christopher Meng <rpm at cicku.me>
Date:   Mon Oct 7 21:51:37 2013 +0800

    Merge branch 'master' into f18

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