SIGN IN SIGN UP

Fix Misc/NEWS merge conflict, hurray

C
Christian Heimes committed
d1d7576fb4a6787e3ebc0b5060561c076c9a4bf7
Parent: efa4867