Merge "MWTimestamp::getHumanTimestamp uses 'just-now' message, which did not exist"

author Nikerabbit <niklas.laxstrom@gmail.com>

Wed, 28 Nov 2012 19:39:39 +0000 (19:39 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 28 Nov 2012 19:39:39 +0000 (19:39 +0000)
author Nikerabbit <niklas.laxstrom@gmail.com>
Wed, 28 Nov 2012 19:39:39 +0000 (19:39 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 28 Nov 2012 19:39:39 +0000 (19:39 +0000)
diff --cc languages/messages/MessagesEn.php
Simple merge
diff --cc languages/messages/MessagesQqq.php
Simple merge
author	Nikerabbit <niklas.laxstrom@gmail.com>
	Wed, 28 Nov 2012 19:39:39 +0000 (19:39 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 28 Nov 2012 19:39:39 +0000 (19:39 +0000)
		1	2
languages/messages/MessagesEn.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/messages/MessagesQqq.php	patch \|	diff1 \|	diff2 \|	blob \| history