Merge branch 'development' of github.com:prawnsalad/KiwiIRC into development
authorDarren <darren@darrenwhitlen.com>
Mon, 6 Oct 2014 17:46:07 +0000 (18:46 +0100)
committerDarren <darren@darrenwhitlen.com>
Mon, 6 Oct 2014 17:46:07 +0000 (18:46 +0100)
commit63083e7fe5e62248340ee1dbc7099992fa27df26
tree9577a36ed2bb8a5827d5c0a67a091ddc7c5f226b
parent04107814d161ff899e9c75507c6acdcda083c194
parentb2bb27e71bb1c72a3fd55984d3817d02607d4a2a
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