commit 5c8e001aad4afd262cab5da1db6d84cc384f4887 Merge: e4f7445 7697ff5 Author: Christopher Meng <rpm at cicku.me> Date: Fri Oct 18 11:16:28 2013 +0800 Merge branch 'master' into f18 .gitignore | 1 + sources | 2 +- youtube-dl.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) ---