[gwenview/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit fec43c794bf4316358081b5424269483aa9f5fb5
Merge: 20521d0 199df89
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:21:55 2014 -0500

    Merge branch 'master' into f20

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