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

[Christopher Meng]

commit a0cb61b81b28d0987b419a0b7f290869b1e46a71
Merge: e54ed44 356680d
Author: Christopher Meng <i at cicku.me>
Date:   Sat Jan 4 02:31:44 2014 +0800

    Merge branch 'master' into f18

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