Merge branch 'master' of https://github.com/konsolebox/geany into konsolebox-master
commit4742cac866c97f61f081ee78a971dcca90e8909b
authorFrank Lanitz <frank@frank.uvena.de>
Sun, 4 Oct 2015 12:57:42 +0000 (4 14:57 +0200)
committerFrank Lanitz <frank@frank.uvena.de>
Sun, 4 Oct 2015 12:57:42 +0000 (4 14:57 +0200)
tree00e453ff6ba6dd091b762442ec5a26fca18872b9
parent932e98fa91da4b73956e73576e5c62ed8070a09d
parentc2b7c279e98ce620f3111bd3981f3c14c9d92196
Merge branch 'master' of https://github.com/konsolebox/geany into konsolebox-master