Here is the merged branch: https://github.com/kugel-/geany/tree/pluxy-merge

I added commits, which should be self-explainatory. Other than that, I fixed a @since tag and a last "pluxies" occurence.

Tell me if I should push that -merge branch to this PR.

—
Reply to this email directly or view it on GitHub.