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

[Till Maas]

commit edd6009b88651e47cfcbdf9c2dd3a7c5daf6eda9
Merge: a059fd7 d63a3cc
Author: Till Maas <opensource at till.name>
Date:   Sun Aug 31 15:05:12 2014 +0200

    Merge branch 'master' into f20

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