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

[Than Ngo]

commit 93a6c3817ce5001195e90bd538535d77154f5846
Merge: 6b2e62c 3ab52c5
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:44:40 2012 +0100

    Merge branch 'f18' into f17

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