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

[Christopher Meng]

commit f3902bd7ac5e643d0850c089d8c46a8b0a28a0dc
Merge: 424fb47 bad4ce1
Author: Christopher Meng <i at cicku.me>
Date:   Mon Feb 16 18:47:54 2015 +0800

    Merge branch 'master' into epel7

 .gitignore       |    1 +
 reposurgeon.spec |   13 ++++++++++---
 sources          |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---