[ansifilter/el6: 5/6] Merge branch 'epel7' into el6

[Christopher Meng]

commit 818da87d6648cb1686244a2a29474151f5871fac
Merge: 57b4914 514fd36
Author: Christopher Meng <i at cicku.me>
Date:   Mon Feb 23 18:43:11 2015 +0800

    Merge branch 'epel7' into el6

 .gitignore      |  1 +
 ansifilter.spec | 54 +++++++++++++++++++++++++++++++++---------------------
 sources         |  2 +-
 3 files changed, 35 insertions(+), 22 deletions(-)
---