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

[Rex Dieter]

commit da9f91337b2e04b9406c704a4909427cfcedbb4a
Merge: 058153f 58e9852
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 28 17:58:33 2012 -0600

    Merge branch 'f18' into f17

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