[geary/wip/713830-disposition: 3/4] Merge branch 'master' into wip/713830-disposition

[Jim Nelson <jnelson src gnome org>]

commit f1d7d09b8d92063fc7ee5e69b3c608864b47e080
Merge: 1edfdde 37253c0
Author: Jim Nelson <jim yorba org>
Date:   Wed Jul 30 19:10:53 2014 -0700

    Merge branch 'master' into wip/713830-disposition

 bindings/vapi/gmime-2.6.vapi               |   18 +++++---
 bindings/vapi/gmime-2.6/gmime-2.6.files    |    2 +-
 bindings/vapi/gmime-2.6/gmime-2.6.metadata |    9 ++++-
 src/engine/rfc822/rfc822-message-data.vala |   64 +++++++++-------------------
 4 files changed, 41 insertions(+), 52 deletions(-)
---