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

[Rex Dieter]

commit 192969361fa7c9e39eeab01dfcf62ac5f85aa9bf
Merge: 6b60d96 21aaf1f
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 14:35:40 2015 -0600

    Merge branch 'master' into f20

 .gitignore   |  2 ++
 libkipi.spec | 11 ++++++++++-
 sources      |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---