[kdepim-runtime/f20: 20/20] Merge branch 'master' into f20

[Rex Dieter]

commit 17c119f608f97a919ffdc968998ef907eeed4827
Merge: 948cbae e6463fa
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 1 09:14:28 2014 -0500

    Merge branch 'master' into f20

 .gitignore          |    9 +++++--
 kdepim-runtime.spec |   57 ++++++++++++++++++++++++++++++++++++--------------
 sources             |    2 +-
 3 files changed, 48 insertions(+), 20 deletions(-)
---