commit b30d3c412d433351ac6669372128dc08a6cc0edb Merge: 66167f5 c8e3d45 Author: Matěj Cepl <mcepl at redhat.com> Date: Mon Jul 21 13:56:34 2014 +0200 Merge branch 'master' into el6 .gitignore | 1 + sources | 2 +- youtube-dl.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) ---