[kdepim/f17: 11/11] Merge branch 'f18' into f17

[Rex Dieter]

commit 640bfb0dd7cd56997130674776d18eb66ddb1281
Merge: d7d898e c40a1c9
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Mar 8 09:16:39 2013 -0600

    Merge branch 'f18' into f17

 .gitignore                                         |    7 +--
 ...rs.patch => kdepim-4.9.95-install_headers.patch |   55 ++++++++++----------
 kdepim.spec                                        |   30 ++++++++---
 sources                                            |    2 +-
 4 files changed, 53 insertions(+), 41 deletions(-)
---