Merge branch 'backbone_ui' of github.com:prawnsalad/KiwiIRC into backbone_ui
authorJack Allnutt <m2ys4u@Gmail.com>
Sun, 23 Sep 2012 23:08:41 +0000 (00:08 +0100)
committerJack Allnutt <m2ys4u@Gmail.com>
Sun, 23 Sep 2012 23:08:41 +0000 (00:08 +0100)
commit39b10c31a8b65dedf68d5d3cba1bd042cee4982f
treed3bb1082b04bea46e99e6ad243b26280d8877f82
parent44197e59f58b85dd9461360ce2bb8c8172f5415a
parent4d6fcfeb9a057580fa93f3112dcac1dea76f018d
Merge branch 'backbone_ui' of github.com:prawnsalad/KiwiIRC into backbone_ui

Conflicts:
client_backbone/css/style.css
client_backbone/dev/model_application.js
client_backbone/dev/view.js
client_backbone/index.html
client_backbone/dev/model_application.js
client_backbone/dev/view.js