]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 02:36:36 +0000 (23:36 -0300)
committerFelipe Pena <felipensp@gmail.com>
Sun, 20 Oct 2013 02:36:36 +0000 (23:36 -0300)
* PHP-5.4:
  - Moved allocation to if block to make Coverity happy


Trivial merge