[gwenview/f19: 8/8] Merge branch 'master' into f19

[Rex Dieter]

commit 38f598043abb663c4410eb104d6d42cd014afa41
Merge: efe5209 7c22e29
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:01:48 2013 -0500

    Merge branch 'master' into f19

 .gitignore    |    5 +++++
 gwenview.spec |   18 +++++++++++++++++-
 sources       |    2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)
---