[libpsl/epel7: 4/4] Merge branch 'master' into epel7

[Christopher Meng]

commit 813fcb20271fd1a7a860c0eebfeaec834b3a6b47
Merge: d27b626 dbd02d6
Author: Christopher Meng <i at cicku.me>
Date:   Tue Nov 25 04:56:20 2014 -0500

    Merge branch 'master' into epel7

 .gitignore  |    1 +
 libpsl.spec |   11 ++++++++++-
 sources     |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
---