Merge branch 'development' of github.com:prawnsalad/KiwiIRC into development
authorDarren <darren@Darrens-MacBook-Pro.local>
Wed, 3 Apr 2013 18:30:26 +0000 (19:30 +0100)
committerDarren <darren@Darrens-MacBook-Pro.local>
Wed, 3 Apr 2013 18:30:26 +0000 (19:30 +0100)

Trivial merge