[glib: 3/3] Merge branch 'fix-overlayfs-trashing-1027' into 'master'

[Ondrej Holy <oholy src gnome org>]

commit 4a77dd67993e1778eeaac85393f9ab07b8a69fb7
Merge: 438547641 1152d99de
Author: Ondrej Holy <oholy redhat com>
Date:   Mon Aug 13 18:01:31 2018 +0000

    Merge branch 'fix-overlayfs-trashing-1027' into 'master'
    
    Fix trashing on overlayfs
    
    Closes #1027
    
    See merge request GNOME/glib!182

 gio/glocalfile.c     | 45 ++++++++++++++++++++++++---------------------
 gio/glocalfileinfo.c |  8 ++------
 gio/tests/trash.c    | 16 ++++++++++------
 3 files changed, 36 insertions(+), 33 deletions(-)
---