Merge branch 'message_events' into development
authorDarren <darren@darrenwhitlen.com>
Sun, 1 Jun 2014 11:20:28 +0000 (12:20 +0100)
committerDarren <darren@darrenwhitlen.com>
Sun, 1 Jun 2014 11:20:28 +0000 (12:20 +0100)
commitb28d1162cda4993476261451a3d8dc3459208201
tree8bfe4bf1b1154dff63613beb82651fe72973e55b
parent15907b92249a9afef427b0f56dcd1b89fb9a0155
parent9b609554e86f6c084878155b2333366f10e376e0
Merge branch 'message_events' into development

* message_events:
  EventComponent comments
  Triggering message:type events
  privmsg/action/notice events combined into a 'message' event
client/src/app.js