Daniel Wagner-Hall 4de08a4672 Revert "Merge two of the room join codepaths"
This reverts commit cf81375b94c4763766440471e632fc4b103450ab.

It subtly violates a guest joining auth check
2016-02-12 16:17:24 +00:00
..
2016-01-07 04:26:29 +00:00
2016-02-02 17:18:50 +00:00