[kdesdk-strigi-analyzers/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 9dc80b74e1ccda5e5e3165da07075b638ba7707f
Merge: 35fdc81 ac07fba
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:54:35 2014 -0500

    Merge branch 'master' into f20

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