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

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

27318e1aa5156f50c547ba9793988199451ce5d7