Merge Colins changes
authorKlaus Ethgen <Klaus@Ethgen.de>
Sun, 1 May 2016 13:09:08 +0000 (14:09 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Sun, 1 May 2016 13:09:08 +0000 (14:09 +0100)
* 'master' of git://www.geeqie.org/geeqie:
  Fix #211 Corrupt help file


Trivial merge