[kdegraphics-mobipocket/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit 8c5d45680f73340c8a5e92bfc183941c5fbed3ab
Merge: 0aaf248 81f81bf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 15:40:05 2014 -0500

    Merge branch 'master' into f20

 .gitignore                  |    4 ++--
 kdegraphics-mobipocket.spec |   23 ++++++++++++++++++++++-
 sources                     |    2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)
---