]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorFelipe Pena <felipensp@gmail.com>
Wed, 16 May 2012 11:40:45 +0000 (08:40 -0300)
committerFelipe Pena <felipensp@gmail.com>
Wed, 16 May 2012 11:40:45 +0000 (08:40 -0300)
commit1abcd81872978026d269532c2f5f1e0f35dcb729
tree97983271c690fbbe9bd46392663e69cc5b20020e
parentd84fa39667111a4efb5a17e29d3d0f795505047a
parent93c91c733cf2259263e4d8c0f3ccc254246d404d
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #55299 (multiple null pointer in win32/registry.c)