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

[KenjiroNakayama]

commit 445e70a3728156ef14fa989f0dd66ad3902c14c5
Merge: 4374274 0e7dae8
Author: Kenjiro Nakayama <nakayamakenjiro at gmail.com>
Date:   Mon Feb 16 09:54:34 2015 +0900

    Merge branch 'master' into f21

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