From: Jack Allnutt <m2ys4u@gmail.com>
Date: Sat, 1 Jun 2013 17:35:07 +0000 (+0100)
Subject: Merge branch 'master' of github.com:prawnsalad/KiwiIRC
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c02d30543d14f720740dabd43495724e5fef1190;hp=12a6ab4c50791fc7906612f85d3345e50f55a6c4;p=KiwiIRC.git

Merge branch 'master' of github.com:prawnsalad/KiwiIRC
---