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

[Matej Cepl]

commit b0ac6f9f53b271dbc36ec27c500c11220ddc4e7f
Merge: bde6780 92f0d42
Author: Matěj Cepl <mcepl at cepl.eu>
Date:   Mon Feb 16 12:50:43 2015 +0100

    Merge branch 'master' into f20

 .gitignore |    1 +
 sources    |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)
---