[youtube-dl/el6: 6/6] Merge branch 'master' into el6

[Matej Cepl]

commit 6dedbe91b0cf927f7e34a49cf824e9e099f269c7
Merge: 8739023 801bd70
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Oct 22 18:25:36 2013 +0200

    Merge branch 'master' into el6

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