Merge Colins changes
authorKlaus Ethgen <Klaus@Ethgen.de>
Tue, 3 May 2016 10:26:21 +0000 (11:26 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Tue, 3 May 2016 10:26:21 +0000 (11:26 +0100)
* 'master' of git://www.geeqie.org/geeqie:
  Document toolbar enhancements


Trivial merge