SIGN IN SIGN UP

Fixed merge accident. Next time I'm going to run the entire test suite ...

C
Christian Heimes committed
2137b6aa997209ac3529c439f82383de0219940d
Parent: b981995