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

[Rex Dieter]

commit e27cb51b6306350e9be098672b921076a5ff6b4f
Merge: 2124bd1 ddf3aad
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:29:44 2014 -0500

    Merge branch 'master' into f20

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