]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAnatol Belski <ab@php.net>
Fri, 23 Aug 2013 14:41:02 +0000 (16:41 +0200)
committerAnatol Belski <ab@php.net>
Fri, 23 Aug 2013 14:41:02 +0000 (16:41 +0200)
* PHP-5.5:
  ensure the test doesn't fail because of tz warning


Trivial merge