[kdegraphics-strigi-analyzer/f17: 8/8] Merge branch 'f18' into f17

[Rex Dieter]

commit 9ac821eaa536c498397db40ab24ec6a4da5f628b
Merge: b590f04 c68093e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 09:15:37 2013 -0600

    Merge branch 'f18' into f17

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