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

[Christopher Meng]

commit f7fed9113c62af538d797f95fcad53a2177de70e
Merge: d7b12b5 e7d3f3a
Author: Christopher Meng <rpm at cicku.me>
Date:   Tue Nov 26 09:30:30 2013 +0800

    Merge branch 'master' into f18

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