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

[Rex Dieter]

commit 0c893bf6bc5b4b8b97e31205423a514ee8d889f5
Merge: 8a6c113 22acd9e
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 22:52:36 2014 -0500

    Merge branch 'master' into f20

 .gitignore  |   12 +++++-------
 kdepim.spec |   48 +++++++++++++++++++++++++++++++++++++++++-------
 sources     |    2 +-
 3 files changed, 47 insertions(+), 15 deletions(-)
---