[evolution-kolab/gnome-3-4: 2/7] Merge branch 'EDS_IMAPX_nobuild-3-4' into gnome-3-4

[Christian Hilberg <chilberg src gnome org>]

commit 23aab7712d02510f0ab7252b0620e75607f021cf
Merge: 4b4639e 1a48d41
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Aug 13 15:46:41 2012 +0200

    Merge branch 'EDS_IMAPX_nobuild-3-4' into gnome-3-4

 .../providers/imapx/camel-imapx-conn-manager.c     |    2 +-
 src/camel/providers/imapx/camel-imapx-server.c     |   72 +++++++++++++++-----
 src/camel/providers/imapx/camel-imapx-store.c      |    3 +-
 3 files changed, 58 insertions(+), 19 deletions(-)
---