[kdegraphics-thumbnailers/f19: 7/7] Merge branch 'master' into f19

[Rex Dieter]

commit 7b863d3dcb64e40889148add79ad8f38c743b6c5
Merge: f06e0a0 93842ce
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:20:30 2013 -0500

    Merge branch 'master' into f19

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