From: Darren <darren@darrenwhitlen.com>
Date: Wed, 24 Jul 2013 20:53:12 +0000 (+0100)
Subject: Merge branch 'development'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=32da968ffd4132d94d9132fdb87002c693b0a053;p=KiwiIRC.git

Merge branch 'development'
---

32da968ffd4132d94d9132fdb87002c693b0a053