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

[Rex Dieter]

commit 442193e06bf83f18dbdae7082af5c88c42f17718
Merge: 9861d18 e41dd35
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 19:38:06 2015 -0600

    Merge branch 'master' into f20

 .gitignore                    |    1 +
 kdegraphics-thumbnailers.spec |    9 ++++++---
 sources                       |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---