Merge "Revert "Function for "pretty timestamps" that are human readable and understan...
authorTychay <tchay@wikimedia.org>
Thu, 25 Oct 2012 22:36:32 +0000 (22:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 25 Oct 2012 22:36:32 +0000 (22:36 +0000)
1  2 
languages/Language.php
languages/messages/MessagesEn.php
maintenance/language/messages.inc
tests/phpunit/languages/LanguageTest.php

Simple merge
Simple merge
Simple merge