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

[Christopher Meng]

commit 141ab72186005d40dc57e37f7226f0ca240aea3c
Merge: 18f03f3 a0157ca
Author: Christopher Meng <i at cicku.me>
Date:   Tue Dec 10 15:28:04 2013 +0800

    Merge branch 'master' into f18

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