[gnome-initial-setup: 2/2] Merge branch 'master' into 'master'

[Will Thompson <wjt src gnome org>]

commit 6958935286aa833b2ff25dfac012d3723d67bc09
Merge: ba7fc97 18874f9
Author: Will Thompson <will willthompson co uk>
Date:   Thu Nov 22 11:04:39 2018 +0000

    Merge branch 'master' into 'master'
    
    gnome-initial-setup.c: avoid a GCC warning
    
    See merge request GNOME/gnome-initial-setup!21

 gnome-initial-setup/gnome-initial-setup.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
---