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

[Rex Dieter]

commit da834530bb905833e2ae8f1bbf5025ba111bc2cb
Merge: b4acda7 eb3f3da
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Jan 22 09:31:04 2015 -0600

    Merge branch 'master' into f20

 kdepim.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---