[kdepimlibs/f19: 10/10] Merge branch 'master' into f19

[Rex Dieter]

commit ff2cec63aad46a44decb4a3192576acc06a9cdf9
Merge: 816367d 6cdcfd3
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 06:37:18 2013 -0500

    Merge branch 'master' into f19

 .gitignore                              |    6 +--
 kdepimlibs-4.10.4-kimap_recursion.patch |   48 -------------------------------
 kdepimlibs.spec                         |   28 ++++++++++++++----
 sources                                 |    2 +-
 4 files changed, 25 insertions(+), 59 deletions(-)
---