]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Sat, 19 Jan 2013 00:15:22 +0000 (22:15 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sat, 19 Jan 2013 00:15:22 +0000 (22:15 -0200)
* PHP-5.5:
  - Fixed ZTS build


Trivial merge