From: Darren <darren@darrenwhitlen.com>
Date: Mon, 6 Oct 2014 17:46:07 +0000 (+0100)
Subject: Merge branch 'development' of github.com:prawnsalad/KiwiIRC into development
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=63083e7fe5e62248340ee1dbc7099992fa27df26;p=KiwiIRC.git

Merge branch 'development' of github.com:prawnsalad/KiwiIRC into development

# By Ramiro Bou (2) and Darren (1)
* 'development' of github.com:prawnsalad/KiwiIRC:
  Emoticons erroneous quote
  Fixing the CTCP PING
  Adding CTCP PING response
---

63083e7fe5e62248340ee1dbc7099992fa27df26