Tim Düsterhus 44454e12e0 Merge branch 'master' into chatTemplate ... Conflicts: file/lib/page/ChatPage.class.php		2011-12-10 21:53:56 +01:00
..
cache/builder	Changing CacheBuilder to return the list rather than an array	2011-11-26 17:51:06 +01:00
event/listener	Added possibility of using Chat/Log and Chat/Send as routes	2011-12-10 21:36:33 +01:00
menu/page	Use FQN of WCF in ChatPageMenuItemProvider	2011-11-29 16:57:44 +01:00
option	Fixed TimeIntervalOptionType	2011-12-10 17:32:42 +01:00