Merge branch 'socks' of https://github.com/M2Ys4U/KiwiIRC into development
authorDarren <darren@Darrens-MacBook-Pro.local>
Wed, 3 Apr 2013 19:13:19 +0000 (20:13 +0100)
committerDarren <darren@Darrens-MacBook-Pro.local>
Wed, 3 Apr 2013 19:13:19 +0000 (20:13 +0100)
commit7036cc7e605541d2113fbad42b2423089a44f543
treeb6447d564065158412c0abc6528fd9a6fa6e5a28
parentc12de1749297cc44fadc4d7042e454c3dc40e107
parent55ccaf502e4fdf233308942624c62e31198fdbb5
Merge branch 'socks' of https://github.com/M2Ys4U/KiwiIRC into development