[evolution-activesync: 2/2] Merge https://github.com/lonely-pluto/evolution-activesync

[dwmw2 <dwmw2 src gnome org>]

commit 42a8243561d36a7ca75e423a75e1eea3c3bd9d73
Merge: cb0f724 1bb7c14
Author: David Woodhouse <David Woodhouse intel com>
Date:   Sun Apr 19 15:00:05 2015 +0100

    Merge https://github.com/lonely-pluto/evolution-activesync

 camel/Makefile.am           |    6 +-
 camel/camel-eas-transport.c |  171 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+), 2 deletions(-)
---