From: Omari Stephens <xsdg@google.com>
Date: Mon, 10 Jul 2017 07:44:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/master' into view_file_po
X-Git-Tag: v1.4~132^2~4
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=70074e6364d2a56232b4fa0a391b7021f7c5e126

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

70074e6364d2a56232b4fa0a391b7021f7c5e126