Merge pull request #7968 from eileenmcnaughton/time
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 14 Mar 2016 11:43:05 +0000 (00:43 +1300)
committerEileen McNaughton <eileen@mcnaughty.com>
Mon, 14 Mar 2016 11:43:05 +0000 (00:43 +1300)
CRM-18232 Handle 'etc/UTF' timezone + CRM-18233 test fix


Trivial merge