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

[Christopher Meng]

commit 6d73efa0b9661664eb2e9f9599a80883bfa9f585
Merge: cdc843a be78407
Author: Christopher Meng <rpm at cicku.me>
Date:   Mon Sep 2 09:21:53 2013 +0800

    Merge branch 'master' into f18

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