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

[Christopher Meng]

commit 18f03f3ab115b612a84765bae433ea77e6f2a79c
Merge: b2c4245 50a07ff
Author: Christopher Meng <rpm at cicku.me>
Date:   Thu Dec 5 11:45:01 2013 +0800

    Merge branch 'master' into f18

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