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

[Christian Hilberg <chilberg src gnome org>]

commit 0907803c51256b141f25938df30ca7d6f6d078d5
Merge: 593d2a0 7e15b5a
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jun 18 10:48:16 2012 +0200

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

 .../providers/imapx/camel-imapx-conn-manager.c     |   22 ++++++++++++++++++-
 src/camel/providers/imapx/camel-imapx-server.c     |    6 +---
 2 files changed, 22 insertions(+), 6 deletions(-)
---