[kdegraphics-strigi-analyzer/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit dc9a233eec97957b1cb62a5dc32e3a2ecc6704dd
Merge: ad08d78 7213468
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:50:21 2014 -0500

    Merge branch 'master' into f20

 .gitignore                       |    6 ++++++
 kdegraphics-strigi-analyzer.spec |   23 ++++++++++++++++++++++-
 sources                          |    2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)
---