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

[Christian Hilberg <chilberg src gnome org>]

commit 95c82963f9d0196e938bcb96a814db277e7e5ecf
Merge: 3bcb167 0f78cf6
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Thu Feb 16 14:58:16 2012 +0100

    Merge branch 'ek-wip-porting'

 src/camel/camel-kolab-imapx-provider.c             |    2 +-
 src/camel/providers/VERSIONS                       |    2 +-
 .../providers/imapx/camel-imapx-extd-folder.c      |    2 +-
 src/camel/providers/imapx/camel-imapx-folder.c     |    2 +-
 src/camel/providers/imapx/camel-imapx-provider.c   |    2 +-
 src/libekolab/kolab-util-backend.c                 |    6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)
---