From: Felipe Pena <felipensp@gmail.com>
Date: Thu, 30 Aug 2012 12:32:26 +0000 (-0300)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha3~8^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb8d603d464af6e50a0907cf4f47a6dc60bce4b5;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)
---

eb8d603d464af6e50a0907cf4f47a6dc60bce4b5