Bug 1074688 - Part 1 Rename the existing EmptyRoomView to be DesktopRoomView, and clean it up, in preparation for the Loop room view implementation. r=nperriault
mozilla-central hg revision: a8567b311260e0c5dbb108ba254f4dbe7897d392
Bug 1093056 Scrollbars shouldn't be shown in the room list by default. r=nperriault
mozilla-central hg revision: d64ba06f84721f85777a69aa612f94b0729f5745
update latest merged cset file