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

[Rex Dieter]

commit 469245318060ed8b18aad84f7953af34abcaf81f
Merge: aff8418 ba61e20
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 08:33:18 2014 -0600

    Merge branch 'master' into f20

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