[evolution-kolab/ek-wip-porting-imapx: 2/2] Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

[Christian Hilberg <chilberg src gnome org>]

commit affd0d4f503d5008bc86e82f88d495524057afee
Merge: f1086c4 ecd91a2
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Dec 19 19:49:27 2011 +0100

    Merge branch 'EDS_IMAPX_nobuild' into ek-wip-porting-imapx

 src/camel/providers/imapx/camel-imapx-server.c |  562 ++++++++++++++----------
 src/camel/providers/imapx/camel-imapx-server.h |    4 +-
 2 files changed, 326 insertions(+), 240 deletions(-)
---