Tim Düsterhus 58e5fa4f58 Merge branch '3.0.x'		2014-08-18 18:20:24 +02:00
..
acp	Fix active acpMenuItem in RoomEditForm	2014-03-21 00:33:27 +01:00
data	Don't color usernames if the color has not been set explicitly	2014-08-12 20:43:35 +02:00
page	Merge branch '3.0.x'	2014-08-18 18:20:24 +02:00
system	Merge branch '3.0.x'	2014-08-14 19:12:02 +02:00
util	Fix formatting	2014-02-28 17:06:50 +01:00