]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorFelipe Pena <felipensp@gmail.com>
Tue, 29 Jan 2013 11:27:09 +0000 (09:27 -0200)
committerFelipe Pena <felipensp@gmail.com>
Tue, 29 Jan 2013 11:27:09 +0000 (09:27 -0200)
* PHP-5.5:
  - Fixed ZTS build


Trivial merge