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

[Christopher Meng]

commit e54ed440fa3bd07348f4f5184334f9493e048dde
Merge: ad0cff0 781efbb
Author: Christopher Meng <i at cicku.me>
Date:   Fri Dec 27 18:00:03 2013 +0800

    Merge branch 'master' into f18

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