From: Darren <darren@Darrens-MacBook-Pro.local>
Date: Mon, 6 May 2013 15:41:40 +0000 (+0100)
Subject: Merge branch 'development' into multi_server
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1b1d4517f6fa5300ce69adf126ea152043fc6af4;p=KiwiIRC.git

Merge branch 'development' into multi_server
---

1b1d4517f6fa5300ce69adf126ea152043fc6af4