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

[Christopher Meng]

commit cdc843a0a15eb78263a1c2e17c0395a50e416f9e
Merge: 4b835a3 87f39ff
Author: Christopher Meng <rpm at cicku.me>
Date:   Fri Aug 30 11:44:54 2013 +0800

    Merge branch 'master' into f18

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