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

[Christian Hilberg <chilberg src gnome org>]

commit c404a0769bfae3dce067ff841edc1f76a8bcf7d7
Merge: 53244e9 93a58ed
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jan 16 20:10:45 2012 +0100

    Merge branch 'ek-wip-porting-imapx' into ek-wip-porting
    
    Conflicts:
    	src/camel/providers/VERSIONS
    
    merge conflict resolution

 src/camel/providers/VERSIONS                     |    2 +-
 src/camel/providers/imapx/camel-imapx-server.c   |  101 +++++++++++++++-------
 src/camel/providers/imapx/camel-imapx-settings.c |   94 ++++++++++++++++++--
 src/camel/providers/imapx/camel-imapx-settings.h |    4 +
 src/camel/providers/imapx/camel-imapx-store.c    |   24 ++++--
 5 files changed, 173 insertions(+), 52 deletions(-)
---