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

[Rex Dieter]

commit b590f04089a4eb5e8877641482316f265c3c7c1d
Merge: 63d9de5 b2f0350
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:44:40 2012 -0600

    Merge branch 'f18' into f17

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