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

[Rex Dieter]

commit 09ae9fa225ecfefa4edf40f18f8a91f22023487f
Merge: c3aee00 adb8e45
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Jan 17 22:23:34 2015 -0600

    Merge branch 'master' into f20

 .gitignore      |    3 +--
 kdepimlibs.spec |   11 +++++++----
 sources         |    2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
---