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

[Rex Dieter]

commit 5f81a304c1afb94902b56d497938856e90e57fd1
Merge: 83238fc 5ea3378
Author: Rex Dieter <rdieter at gmail.com>
Date:   Sun Mar 1 14:08:44 2015 -0600

    Merge branch 'master' into f20

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