[httrack/epel7: 3/3] Merge branch 'master' into epel7

[Christopher Meng]

commit 0bba52b69decb41796528e4053bce0e6ea323478
Merge: 58d60ea 8a7c587
Author: Christopher Meng <i at cicku.me>
Date:   Fri Jul 25 14:37:43 2014 +0800

    Merge branch 'master' into epel7

 .gitignore   |    1 +
 httrack.spec |    9 +++++----
 sources      |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---