[kdepim/f19: 14/14] Merge branch 'master' into f19

[Rex Dieter]

commit 5a2dc36b490a652ad9df9a10a2c0c898883a7885
Merge: 1e690b4 32f088b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 13:21:33 2013 -0500

    Merge branch 'master' into f19

 .gitignore                                         |    5 ++
 ... kdepim-4.10.90-install_kleopatra_headers.patch |   45 ++++++++----------
 kdepim.spec                                        |   49 ++++++++++++++++----
 sources                                            |    2 +-
 4 files changed, 67 insertions(+), 34 deletions(-)
---