From: Omari Stephens <xsdg@google.com>
Date: Mon, 10 Jul 2017 17:16:53 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master' into cluster
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=76d1183be9bc68127e31d3025f7c5977d6373af3

Merge remote-tracking branch 'upstream/master' into cluster
---

76d1183be9bc68127e31d3025f7c5977d6373af3