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

[KenjiroNakayama]

commit 26410399b6cd9bb92c1500f545e6b8426a4fda89
Merge: 74cf188 989b67c
Author: Kenjiro Nakayama <nakayamakenjiro at gmail.com>
Date:   Mon Dec 15 14:38:07 2014 +0900

    Merge branch 'master' into epel7

 .gitignore               |    1 +
 sources                  |    2 +-
 the_silver_searcher.spec |   12 ++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)
---