From: Jack Allnutt <m2ys4u@Gmail.com>
Date: Sat, 1 Oct 2011 09:00:27 +0000 (+0100)
Subject: Merge branch 'master' into no-php
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=00203319f52c47fb449ba96fcb95e4041328722f;p=KiwiIRC.git

Merge branch 'master' into no-php
---

00203319f52c47fb449ba96fcb95e4041328722f