[shotwell: 2/2] Merge branch 'master' into 'master'

[Jens Georg <jensgeorg src gnome org>]

commit 886dca64cf13cc6e48df69e3e89baa46a66d9394
Merge: bbcf1ee1 ba01e112
Author: Jens Georg <mail jensge org>
Date:   Mon Aug 13 10:28:35 2018 +0000

    Merge branch 'master' into 'master'
    
    Changed stderr.printf() to warning() in thumbnailer
    
    See merge request GNOME/shotwell!5

 thumbnailer/shotwell-video-thumbnailer.vala | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---