From: tonymke <tony.lechner@gmail.com>
Date: Sat, 17 May 2014 20:56:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'upstream/development' into tonytrunk
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f1c52ab8919fa291795ccf2f4a267eb2daa19ebf;p=KiwiIRC.git

Merge remote-tracking branch 'upstream/development' into tonytrunk
---

f1c52ab8919fa291795ccf2f4a267eb2daa19ebf