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

[Rex Dieter]

commit 0886ed8f59612abe2f658ece83d407f16a465c5e
Merge: 217bad2 169dc6c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:32:39 2014 -0500

    Merge branch 'master' into f20

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