Tim Düsterhus 5ad865d232 Merge branch 'acp' ...

Conflicts:
	install.sql

2012-02-05 20:59:11 +01:00

..

message

Adding ID to each message, ensure every message is shown only once

2012-02-05 19:06:00 +01:00

room

Adding ChatRoomEditForm

2012-02-05 18:29:16 +01:00