Merge branch 'master' of github.com:geany/geany
commit9e18884390157de3e557a7210e8159fef40620f5
authorColomban Wendling <ban@herbesfolles.org>
Tue, 19 Aug 2014 12:06:11 +0000 (19 14:06 +0200)
committerColomban Wendling <ban@herbesfolles.org>
Tue, 19 Aug 2014 12:06:11 +0000 (19 14:06 +0200)
tree38b5464acf55d6acfd2792fbd5a2f542a5c0b8d6
parent0817dddc855a062521e64172810b3ede913eb004
parenta8e8e2cd9e34d91fb769101cdcda8f696ce067ae
Merge branch 'master' of github.com:geany/geany