Merge branch 'master' of github.com:sixtyfive/geeqie
authorJ. R. Schmid <jrs+git@weitnahbei.de>
Sat, 11 Mar 2017 13:50:08 +0000 (14:50 +0100)
committerJ. R. Schmid <jrs+git@weitnahbei.de>
Sat, 11 Mar 2017 13:50:08 +0000 (14:50 +0100)

Trivial merge