<p>Here is the merged branch: <a href="https://github.com/kugel-/geany/tree/pluxy-merge">https://github.com/kugel-/geany/tree/pluxy-merge</a></p>

<p>I added commits, which should be self-explainatory. Other than that, I fixed a <a href="https://github.com/since" class="user-mention">@since</a> tag and a last "pluxies" occurence.</p>

<p>Tell me if I should push that -merge branch to this PR.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href="https://github.com/geany/geany/pull/629#issuecomment-145294301">view it on GitHub</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJwSQXlhnyumC9uZD8fOFLbyt5uXFks5o4EmCgaJpZM4Fy7fG.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/geany/geany/pull/629#issuecomment-145294301"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>