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

[Rex Dieter]

commit 217bad2741536d4b6233480626efe1e607a26459
Merge: 141e69c 893ddc8
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:54:55 2014 -0500

    Merge branch 'master' into f20

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