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

[Matej Cepl]

commit 97e6fb878724a0b83259f9bc8a81a0d4490f2d65
Merge: f0d1de3 ae6d085
Author: Matěj Cepl <mcepl at cepl.eu>
Date:   Thu Mar 5 16:38:28 2015 +0100

    Merge branch 'master' into f20

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