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

[Christopher Meng]

commit 35c75eaca6d47f1faeadbe0da5866a09f354aa55
Merge: e65bd98 d30af13
Author: Christopher Meng <i at cicku.me>
Date:   Mon Jun 9 15:58:13 2014 +0800

    Merge branch 'master' into f19

 .gitignore      |    2 ++
 sources         |    2 +-
 youtube-dl.spec |   11 ++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)
---