[geary: 2/2] Merge branch 'paste-shortcuts' into 'master'

[Michael Gratton <mjog src gnome org>]

commit ceea747a454cd706fadabd960cb06824f3345215
Merge: 4e85b516 74a6802d
Author: Michael Gratton <mike vee net>
Date:   Fri Jul 27 00:00:36 2018 +0000

    Merge branch 'paste-shortcuts' into 'master'
    
    Make generic "Paste" action paste with formatting if possible
    
    See merge request GNOME/geary!27

 src/client/composer/composer-widget.vala | 23 ++++++++++++++---------
 ui/composer-menus.ui                     |  4 ++--
 2 files changed, 16 insertions(+), 11 deletions(-)
---