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

[Rex Dieter]

commit 6b60d96b42d71723177ac54f0984f822c426e0f2
Merge: e15ecd0 6ad5b8c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 19 13:31:06 2015 -0600

    Merge branch 'master' into f20

 .gitignore   |   32 ++------------------------------
 libkipi.spec |   19 +++++++++++--------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 39 deletions(-)
---