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

[Rex Dieter]

commit d934a8460f42d1f9c8e06581ec14c9c70b69f958
Merge: 3956e4a bd6a1cf
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Feb 3 07:07:55 2014 -0600

    Merge branch 'master' into f20

 .gitignore                                         |   12 +++----
 ... kdepim-4.11.90-install_kleopatra_headers.patch |   38 ++++++++++----------
 kdepim.spec                                        |   27 +++++++++++++-
 sources                                            |    2 +-
 4 files changed, 50 insertions(+), 29 deletions(-)
---