Tim Düsterhus 94a48df147 Merge branch 'master' into commands ...

Conflicts:
	file/lib/data/chat/message/ChatMessage.class.php

2012-01-22 14:10:10 +01:00

..

data/chat

Merge branch 'master' into commands

2012-01-22 14:10:10 +01:00

form

Commands return the receiver now as well

2011-12-27 14:39:35 +01:00

page

Code format and removing unneeded templatelistener

2012-01-21 17:45:53 +01:00

system

Merge branch 'master' into commands

2012-01-22 14:10:10 +01:00

util

Merge branch 'master' into chatTplRedesign

2011-12-26 16:05:29 +01:00