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

[Than Ngo]

commit db2f71f1261a57a2835847a036142b58ad29116c
Merge: ab3334e e3f7313
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:32:58 2012 +0100

    Merge branch 'f18' into f17

 .gitignore                                         |    1 +
 ...tegories-same-as-KMail2-avoids-Lost-Found.patch |   21 --------------------
 kdepim.spec                                        |   10 ++++----
 sources                                            |    2 +-
 4 files changed, 7 insertions(+), 27 deletions(-)
---