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

[Rex Dieter]

commit c845ab98563ce9ad9bc4acae7dca399dcfd4a0db
Merge: 17c119f 7678130
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 15 12:31:15 2014 -0500

    Merge branch 'master' into f20

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