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

[Rex Dieter]

commit 2124bd1bb66b3634119aa1af21e1fb9a5beba32e
Merge: 5c59223 d3e3ad2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:50:43 2014 -0500

    Merge branch 'master' into f20

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