From: tonymke <tony.lechner@gmail.com>
Date: Wed, 14 May 2014 02:12:50 +0000 (-0500)
Subject: Merge upstream branch 'development' into tonytrunk
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f9f212b64bf336a2a489f3de2025f83ddcd5fca3;p=KiwiIRC.git

Merge upstream branch 'development' into tonytrunk

Conflicts:
	client/src/models/application.js
---

f9f212b64bf336a2a489f3de2025f83ddcd5fca3