[libkipi/f20: 2/2] Merge branch 'master' into f20

[Rex Dieter]

commit 5a813cd6436e890e8db06e51c1c33b74e18d69a5
Merge: 388bb6d 46cc3ca
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jul 14 23:02:30 2014 -0500

    Merge branch 'master' into f20

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