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