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

[Rex Dieter]

commit 4949dea5290d9a575594bc9516257c1cae150b82
Merge: 4967a12 4cdc784
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 10:49:54 2014 -0500

    Merge branch 'master' into f20

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