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

[Rex Dieter]

commit a92ce257155fc073edef6ffb8ec55610c00a3dbd
Merge: c845ab9 a225e67
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Sep 16 20:13:25 2014 -0500

    Merge branch 'master' into f20

 .gitignore          |    3 +++
 kdepim-runtime.spec |   14 +++++++++++++-
 sources             |    2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)
---