From: Darren <darren@Darrens-MacBook-Pro.local>
Date: Wed, 3 Apr 2013 19:15:46 +0000 (+0100)
Subject: Merge branch 'socks' of https://github.com/M2Ys4U/KiwiIRC into development
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d1552556bfd232542aa6e5ea8f335ad27423e433;p=KiwiIRC.git

Merge branch 'socks' of https://github.com/M2Ys4U/KiwiIRC into development
---

d1552556bfd232542aa6e5ea8f335ad27423e433