Lex Trotman - 2012-09-16

Pull request awaiting testing. https://github.com/geany/geany/pull/31