Merge "Added new MWTimestamp::getRelativeTimestamp for pure relative."

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Fri, 27 Sep 2013 17:45:26 +0000 (17:45 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 27 Sep 2013 17:45:26 +0000 (17:45 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 27 Sep 2013 17:45:26 +0000 (17:45 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 27 Sep 2013 17:45:26 +0000 (17:45 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/Timestamp.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 27 Sep 2013 17:45:26 +0000 (17:45 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 27 Sep 2013 17:45:26 +0000 (17:45 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Timestamp.php	patch \|	diff1 \|	diff2 \|	blob \| history