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

[Rex Dieter]

commit 8f2394b80233427665a6cd9f6a6c22eb0a73eb47
Merge: e7063af 5ba0d14
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Nov 8 19:51:56 2014 -0600

    Merge branch 'master' into f20

 .gitignore           |    1 +
 gwenview.appdata.xml |  208 ++++++++++++++++++++++++++++++++++++++++++++++++++
 gwenview.spec        |   18 ++++-
 sources              |    2 +-
 4 files changed, 227 insertions(+), 2 deletions(-)
---