From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 16 May 2012 11:40:53 +0000 (-0300)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~193
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42faa077f9e763d29ee157a59e21007d7fd937aa;p=php

Merge branch 'PHP-5.4'

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

42faa077f9e763d29ee157a59e21007d7fd937aa