From: Anatol Belski <ab@php.net>
Date: Fri, 23 Aug 2013 14:41:02 +0000 (+0200)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77303a32481519b888061b8851771fb111c13c54;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  ensure the test doesn't fail because of tz warning
---

77303a32481519b888061b8851771fb111c13c54