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

[Rex Dieter]

commit 8fcafdf26e970b8ddcbbf24c4af2cdfcdc1783a4
Merge: 7e2f61d ec609c2
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:13:30 2015 -0600

    Merge branch 'master' into f20

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