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

[Christopher Meng]

commit a059fd72d994addbec2497fe6af8988397a92eba
Merge: 92c7969 3ed20da
Author: Christopher Meng <i at cicku.me>
Date:   Tue Jul 29 17:05:30 2014 +0800

    Merge branch 'master' into f20

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