Merge Colins changes
authorKlaus Ethgen <Klaus@Ethgen.de>
Thu, 5 May 2016 19:29:30 +0000 (20:29 +0100)
committerKlaus Ethgen <Klaus@Ethgen.de>
Thu, 5 May 2016 19:29:30 +0000 (20:29 +0100)
* 'master' of git://www.geeqie.org/geeqie:
  Lua Documentation


Trivial merge