[kdesdk-strigi-analyzers/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit fa55a67b5accad54ed3a90fe7fdf45e30defddf5
Merge: 9dc80b7 c2900c9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:32:26 2014 -0500

    Merge branch 'master' into f20

 .gitignore                   |    1 +
 kdesdk-strigi-analyzers.spec |    5 ++++-
 sources                      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---