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

[Rex Dieter]

commit 388bb6d2a5b0fd19403d5104ebdfa71bce99e380
Merge: ab15859 6148b14
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 16:59:02 2014 -0500

    Merge branch 'master' into f20

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