From: Darren <darren@darrenwhitlen.com>
Date: Thu, 17 Jul 2014 21:13:53 +0000 (+0100)
Subject: Merge branch 'CoryChaplin-fix_380' into development
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bee4d428e9fc5c34d1fc53fb686b981c82afd7bc;p=KiwiIRC.git

Merge branch 'CoryChaplin-fix_380' into development
---

bee4d428e9fc5c34d1fc53fb686b981c82afd7bc