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

[Rex Dieter]

commit d7d898efd650f6aabbbfb0e6f830a6a8551583b6
Merge: db2f71f 47c6c0a
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Dec 29 07:45:36 2012 -0600

    Merge branch 'f18' into f17

 .gitignore  |    1 +
 kdepim.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---