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

[Rex Dieter]

commit bf2bd5eb18a5f4c5c5b1c80279fc332e6935e7a5
Merge: ab6914c 7406d7e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Mar 6 16:35:07 2013 -0600

    Merge branch 'f18' into f17

 .gitignore   |    4 +---
 libkipi.spec |   36 ++++++++++++++++++++++++------------
 sources      |    2 +-
 3 files changed, 26 insertions(+), 16 deletions(-)
---