Merge "Show absolute block expiry in user timezone on block logs"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 9 Apr 2016 19:37:29 +0000 (19:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 9 Apr 2016 19:37:29 +0000 (19:37 +0000)
1  2 
languages/Language.php
languages/classes/LanguageFi.php

Simple merge
Simple merge