Fix lost code in a merge commit.

vecna: you are evil >:P
Make dates look nicer