[kdenetwork-strigi-analyzers/f20: 11/11] Merge branch 'master' into f20

[Rex Dieter]

commit 5b40a8013790152807c58b6f380f54080b6fa811
Merge: ebbaf60 f0beb1a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:52:12 2014 -0500

    Merge branch 'master' into f20

 .gitignore                       |    6 ++++++
 kdenetwork-strigi-analyzers.spec |   26 +++++++++++++++++++++++++-
 sources                          |    2 +-
 3 files changed, 32 insertions(+), 2 deletions(-)
---