]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorFelipe Pena <felipensp@gmail.com>
Thu, 30 Aug 2012 12:32:34 +0000 (09:32 -0300)
committerFelipe Pena <felipensp@gmail.com>
Thu, 30 Aug 2012 12:32:34 +0000 (09:32 -0300)
* PHP-5.4:
  - Fixed bug #62955 (Only one directive is loaded from "Per Directory Values" Windows registry)


Trivial merge