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)
commit073ac3319ea17dbf4538be4ec77cd0137f4e79b7
tree3e6a2afbf21b36c1573f888f7630584059ae76fe
parent4c94608d1f48c724e84a2c3b527444e42c68d6b2
parente64b20d1d3753a2c78ac9f1d55ed7060f1788dcf
Merge Colins changes

* 'master' of git://www.geeqie.org/geeqie:
  Fix #211 Corrupt help file