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

[Christopher Meng]

commit 920a76119532f15f8eb7089ff9053a6d05d3805a
Merge: 0c4e978 983ef37
Author: Koji <koji at fedoraproject.org>
Date:   Tue Aug 13 09:10:26 2013 +0800

    Merge branch 'master' into f18

 .gitignore      |    1 +
 sources         |   11 +----------
 youtube-dl.spec |   10 ++++++----
 3 files changed, 8 insertions(+), 14 deletions(-)
---