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

[Rex Dieter]

commit 1f410be4484d7e3e762861e21238823d92869ac0
Merge: 442193e a052e0d
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 17:12:35 2015 -0600

    Merge branch 'master' into f20

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