commit fc36aed14c87c4c83b4c3971d7c5ca6a3e1be81b Merge: 920a761 53c8157 Author: Koji <koji at fedoraproject.org> Date: Sun Aug 18 19:32:00 2013 +0800 Merge branch 'master' into f18 .gitignore | 1 + sources | 2 +- youtube-dl.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) ---