From: Darren <darren@darrenwhitlen.com>
Date: Mon, 26 Jan 2015 11:19:17 +0000 (+0000)
Subject: Merge branch 'development'
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cd9dd99d384873a4c47d77047a3a29f5de52c3c4;p=KiwiIRC.git

Merge branch 'development'

Conflicts:
	client/src/applets/startup.js
---

cd9dd99d384873a4c47d77047a3a29f5de52c3c4