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

..

cache/builder

Changing CacheBuilder to return the list rather than an array

2011-11-26 17:51:06 +01:00

chat

Adding missing space

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

event/listener

Adding ChatCopyrightPage with overlay

2012-01-14 16:33:44 +01:00

menu/page

Use current()

2012-01-03 13:10:46 +01:00

option

Fixed TimeIntervalOptionType

2011-12-10 17:32:42 +01:00