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

[Rex Dieter]

commit 43d2ba7be51acb4d8f7ae948ede22b424767687e
Merge: 4a33f97 c52c913
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:13:14 2015 -0600

    Merge branch 'master' into f20

 .gitignore                   | 2 ++
 kdesdk-strigi-analyzers.spec | 8 +++++++-
 sources                      | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)
---