]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Tue, 9 Apr 2013 08:09:33 +0000 (12:09 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 9 Apr 2013 08:09:33 +0000 (12:09 +0400)
* PHP-5.5:
  Fixed ZTS build


Trivial merge