[libkipi/f19: 8/8] Merge branch 'master' into f19

[Rex Dieter]

commit 0f046f71a481130d9423e374abe0571b29d422f0
Merge: 9028fb8 efb5510
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Sep 4 23:46:45 2013 -0500

    Merge branch 'master' into f19

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