From: jdeveloper <jdeveloper.inxenio@gmail.com>
Date: Wed, 15 Oct 2014 09:06:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/development' into development
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e83deaf4153932106ab24afb916201a8ab41a5f9;p=KiwiIRC.git

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

e83deaf4153932106ab24afb916201a8ab41a5f9