Merge branch 'trailing' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-trailing
authorDarren <darren@darrenwhitlen.com>
Sun, 16 Mar 2014 22:26:15 +0000 (22:26 +0000)
committerDarren <darren@darrenwhitlen.com>
Sun, 16 Mar 2014 22:26:15 +0000 (22:26 +0000)

Trivial merge