]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a80cec 25b3c94)
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)
Conflicts:
Zend/zend_ini_scanner.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.