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

[Christopher Meng]

commit ecdd778f821b41421e447bf5270b9b390c3aa1f8
Merge: 0bba52b 565beb2
Author: Christopher Meng <i at cicku.me>
Date:   Wed Aug 6 15:51:23 2014 +0800

    Merge branch 'master' into epel7

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