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

[Rex Dieter]

commit e19ccda7e3c4d50b734b1b6cde5aed41a7078a0a
Merge: dc9a233 0c0407a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:29:29 2014 -0500

    Merge branch 'master' into f20

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