commit 7459d339e45e346fb8980a6b409e5aecf0560529 Merge: f7fed91 dca5fb8 Author: Christopher Meng <rpm at cicku.me> Date: Fri Nov 29 11:49:47 2013 +0800 Merge branch 'master' into f18 .gitignore | 1 + sources | 2 +- youtube-dl.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) ---