Merge remote-tracking branches #419 and #416
authorKlaus Ethgen <Klaus@Ethgen.de>
Fri, 15 Jul 2016 17:39:02 +0000 (18:39 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Fri, 15 Jul 2016 17:39:02 +0000 (18:39 +0100)
* merge-requests/419:
  Force focus to geeqie after leaving fullscreen

* merge-requests/416:
  Add four new preferences


Trivial merge