[youtube-dl/f19: 3/3] Merge branch 'master' into f19

[Matej Cepl]

commit 2f155e483e9c0d1029ab085adcc1eaa69a438912
Merge: a5a36e0 c8e3d45
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Mon Jul 21 13:15:09 2014 +0200

    Merge branch 'master' into f19

 .gitignore      |    2 ++
 sources         |    2 +-
 youtube-dl.spec |   17 +++++++++++------
 3 files changed, 14 insertions(+), 7 deletions(-)
---