[geary/wip/731561-fix-move: 2/2] Merge branch 'master' into wip/731561-fix-move

[Jim Nelson <jnelson src gnome org>]

commit 771902685253b143b0661cf9299ac3ecae9af733
Merge: b378f24 2a35b77
Author: Jim Nelson <jim yorba org>
Date:   Wed Jun 18 13:17:24 2014 -0700

    Merge branch 'master' into wip/731561-fix-move

 src/client/application/geary-controller.vala       |   13 +++++++++++++
 src/client/components/folder-menu.vala             |    8 +++++++-
 src/engine/api/geary-folder-supports-copy.vala     |    3 +++
 src/engine/api/geary-folder-supports-move.vala     |    3 +++
 .../imap-engine/imap-engine-minimal-folder.vala    |    8 ++++++++
 5 files changed, 34 insertions(+), 1 deletions(-)
---