[evolution-kolab: 3/3] Merge branch 'ek-wip-porting'

[Christian Hilberg <chilberg src gnome org>]

commit 9d888f6381cc338deefd2647730e0f59608966b8
Merge: e423721 797561d
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Apr 16 14:44:07 2012 +0200

    Merge branch 'ek-wip-porting'

 src/calendar/e-cal-backend-kolab.c              |   23 ++++++++++++++++++-----
 src/libekolabconv/test/src/test-kolab-contact.c |    5 +++++
 src/libekolabconv/test/src/test-kolab-event.c   |    5 +++++
 3 files changed, 28 insertions(+), 5 deletions(-)
---