Merge branch 'master' of github.com:geany/geany
commitae68b10b04aad477efb29acc1d547dac0ff30c1e
authorFrank Lanitz <frank@frank.uvena.de>
Tue, 10 Feb 2015 17:55:00 +0000 (10 18:55 +0100)
committerFrank Lanitz <frank@frank.uvena.de>
Tue, 10 Feb 2015 17:55:00 +0000 (10 18:55 +0100)
tree178d54796487e79cea379fbb5b7d026136ad1088
parent642fedef98a1792ab5873b0b8e34b39a19a14f8a
parente9c9e9a2fa021e22ab3235b089c3e651f0094016
Merge branch 'master' of github.com:geany/geany