]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5'
authorLars Strojny <lstrojny@php.net>
Wed, 27 Mar 2013 20:37:42 +0000 (21:37 +0100)
committerLars Strojny <lstrojny@php.net>
Wed, 27 Mar 2013 20:37:42 +0000 (21:37 +0100)
commit218bcee202ee165da7513cd9cc77bf1820572971
tree3a1eff4d52c7dba3249cd12c7592990822411d5a
parent9a80cec0cefea2490bb19d109e3e9ebf2186eafb
parent25b3c949440471ac39ec7126b9f15fc4cbc675ea
Merge branch 'PHP-5.5'

Conflicts:
Zend/zend_ini_scanner.c