From: Darren <darren@Darrens-MacBook-Pro.local>
Date: Fri, 17 May 2013 16:19:43 +0000 (+0100)
Subject: Merge branch 'master' into development
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e6f8dcd0db7539f8a78b96927cbf2772392cf42c;p=KiwiIRC.git

Merge branch 'master' into development
---

e6f8dcd0db7539f8a78b96927cbf2772392cf42c