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

[Christopher Meng]

commit 50c4aa9f11b7827ca94d3bff36470a7b3aec4454
Merge: 5c8e001 801bd70
Author: Christopher Meng <rpm at cicku.me>
Date:   Sun Oct 20 10:14:58 2013 +0800

    Merge branch 'master' into f18

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