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

[Rex Dieter]

commit 85edd71f3f945a6e5564640274ef07799b428e3a
Merge: 0c893bf 350baeb
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:30:59 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |    1 +
 kdepim.spec |    7 +++++--
 sources     |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---