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

[Rex Dieter]

commit 80f51e628cb36de041c6abd45147bb6c970eb532
Merge: ba0a8d5 f1e1eef
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jun 30 14:20:46 2014 -0500

    Merge branch 'master' into f20

 .gitignore      |   10 ++--------
 kdepimlibs.spec |   30 ++++++++++++++++++++++++++----
 sources         |    2 +-
 3 files changed, 29 insertions(+), 13 deletions(-)
---