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

[Rex Dieter]

commit 20521d037d142e882c89430d5a814b4eb2063ebe
Merge: fa44a53 7d9f6bb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:38:10 2014 -0500

    Merge branch 'master' into f20

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