Merge "Function for "pretty timestamps" that are human readable and understandable."
authorReedy <reedy@wikimedia.org>
Thu, 25 Oct 2012 00:58:19 +0000 (00:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 25 Oct 2012 00:58:19 +0000 (00:58 +0000)
1  2 
languages/Language.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/language/messages.inc
tests/phpunit/languages/LanguageTest.php

Simple merge
Simple merge
Simple merge
Simple merge