gustafn
committed
on 05 Sep 15
- add missing handling for "merged" user state
- add message key