Merge "Return a TTL when formatting times"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 24 Jun 2014 22:57:17 +0000 (22:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 24 Jun 2014 22:57:17 +0000 (22:57 +0000)
1  2 
languages/Language.php

Simple merge