Merge "Proper handling of invalid/unknown time zones"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 5 Jan 2017 15:11:02 +0000 (15:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 5 Jan 2017 15:11:02 +0000 (15:11 +0000)
1  2 
includes/Preferences.php

Simple merge