projects / KiwiIRC.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c12de17 55ccaf5)
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)

Trivial merge