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

[Rex Dieter]

commit 9861d189a34fc97b7f170ec6643e0e34399cebf9
Merge: 23218ed 60bf21f
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 20:01:53 2014 -0600

    Merge branch 'master' into f20

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