[gimp/gimp-attributes-wip: 15/16] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip

[Hartmut Kuhse <hartmutkuhse src gnome org>]

commit 57675e171c20c4fb0f1c6fa26a4ea6f9069ab120
Merge: 41c129e d641203
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Sat Apr 2 21:46:00 2016 +0200

    Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip

 plug-ins/screenshot/Makefile.am       |    1 +
 plug-ins/screenshot/screenshot-icon.h |   80 ++++++++++++++++++++++++++++
 plug-ins/screenshot/screenshot.c      |   93 ++------------------------------
 3 files changed, 87 insertions(+), 87 deletions(-)
---