Merge branch 'backbone_ui' of github.com:prawnsalad/KiwiIRC into backbone_ui
authorJack Allnutt <m2ys4u@Gmail.com>
Thu, 1 Nov 2012 17:20:51 +0000 (17:20 +0000)
committerJack Allnutt <m2ys4u@Gmail.com>
Thu, 1 Nov 2012 17:20:51 +0000 (17:20 +0000)

Trivial merge