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

[Christopher Meng]

commit bde83e94f1abbff5caefa0578b27218d22bc97fc
Merge: 2be39ef 88957f6
Author: Christopher Meng <i at cicku.me>
Date:   Fri Mar 21 14:36:30 2014 +0800

    Merge branch 'master' into epel7

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