[libkipi/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit ab6914c4df010b54e09f0866536f534ba0f5a5cc
Merge: 93a6c38 dd07fe0
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 16:36:38 2012 -0600

    Merge branch 'f18' into f17

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