[gimp: 2/2] Merge git://git.gnome.org/gimp

[Klaus Staedtler <klausstaedtler src gnome org>]

commit 2c05b4288c76a6cad40459f331fba3d1b58820f4
Merge: e6ba618 0a8c322
Author: klausstaedtler <staedtler-przyborski web de>
Date:   Thu Jun 2 18:28:00 2016 +0200

    Merge git://git.gnome.org/gimp

 INSTALL.in                                         |    2 +-
 configure.ac                                       |    6 ++-
 ...imp-char-picker-24.svg => gimp-char-picker.svg} |    0
 plug-ins/common/mail.c                             |   32 +++++++++++++-------
 4 files changed, 26 insertions(+), 14 deletions(-)
---