Tim Düsterhus 4abb837878 Merge branch 'master' into suspensionList ...

Conflicts:
	package.xml

2013-06-22 14:41:40 +02:00

..

message

Throw InvalidArgumentException instead of NotFoundException

2013-06-18 00:29:22 +02:00

room

Handle whisper formatting on the client side.

2013-05-28 23:39:19 +02:00

suspension

Don't delete expired suspensions

2013-06-22 14:40:54 +02:00

CHATDatabaseObject.class.php

Added missing space

2013-01-27 18:14:27 +01:00