[kdegraphics-mobipocket/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 9c6c32b17dfd8bf932d36b51625e29e0b4ad403d
Merge: 0d3479a 7828b6a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:44:01 2012 -0600

    Merge branch 'f18' into f17

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