Merge branch 'master' of github.com:geany/geany
commitb9e090d2c84d7114a01537fad2968b93e978747e
authorEnrico Tröger <enrico.troeger@uvena.de>
Sun, 12 Apr 2015 20:54:22 +0000 (12 22:54 +0200)
committerEnrico Tröger <enrico.troeger@uvena.de>
Sun, 12 Apr 2015 20:54:22 +0000 (12 22:54 +0200)
tree3662b6423423047f80577e332371a3ec511f74f3
parentf03206744361baac1c811db97f5d2816409d7787
parentd1a3ec1849c3cd337c3eef9cd25374248da97bab
Merge branch 'master' of github.com:geany/geany