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

[Rex Dieter]

commit 6b5d01a74f56260d6f07e9b14085e105293822bd
Merge: b685cd4 fe9b39a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Oct 11 13:08:57 2014 -0500

    Merge branch 'master' into f20

 .gitignore      |    5 ++---
 kdepimlibs.spec |   10 +++++++++-
 sources         |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)
---