commit 4b835a3b4d60ddb9b2fce23e7b1b11541a5a02cf Merge: dd426d2 71a4179 Author: Koji <koji at fedoraproject.org> Date: Tue Aug 27 17:13:18 2013 +0800 Merge branch 'master' into f18 .gitignore | 1 + sources | 2 +- youtube-dl.spec | 23 ++++++++++++----------- 3 files changed, 14 insertions(+), 12 deletions(-) ---