Merge "SI standards for time units"
authorSiebrand <siebrand@wikimedia.org>
Wed, 17 Oct 2012 23:09:49 +0000 (23:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 17 Oct 2012 23:09:49 +0000 (23:09 +0000)
1  2 
languages/messages/MessagesEn.php
tests/phpunit/languages/LanguageTest.php

Simple merge