Merge branch 'notify'
authorSteve Youngs <steve@emchat.org>
Sat, 4 Feb 2012 03:10:51 +0000 (13:10 +1000)
committerSteve Youngs <steve@emchat.org>
Sat, 4 Feb 2012 03:10:51 +0000 (13:10 +1000)
* notify:
  Send notifications for incoming messages.


Trivial merge