]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.3:
  - Fixed bug #55299 (multiple null pointer in win32/registry.c)


Trivial merge