]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorDaniel Lowrey <rdlowrey@php.net>
Fri, 7 Mar 2014 12:26:48 +0000 (05:26 -0700)
committerDaniel Lowrey <rdlowrey@php.net>
Fri, 7 Mar 2014 12:26:48 +0000 (05:26 -0700)
commitddd855cbc2d126e5ef8ecba0103b97e23d53128f
treead188106ec80bbd2b02075075112afa55504e5f5
parent777831a24b1259563048721a4ec023a0d4e1531f
parentff3c6931c0b3c275127ec8a73ad82fa2f9ff527c
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update php.ini files (new openssl directives)
php.ini-development
php.ini-production