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

Merge branch 'multi_server' into development
---

d34a332de64b6e474d5a8e1b105847e1964b555e