commit 57a2cc10eccdd34f401fe89d9ebbaaf02ebea2ce Merge: fe19999 4349122 Author: Christopher Meng <i at cicku.me> Date: Fri Aug 8 09:16:57 2014 +0800 Merge branch 'f20' into el6 .gitignore | 1 + httrack.spec | 23 +++++++++++++++-------- sources | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) ---