[geany/geany] 5425e3: Merge branch 'master' of git://github.com/zygimantus/geany