]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorandrey <andrey@php.net>
Fri, 29 Jun 2012 11:41:11 +0000 (14:41 +0300)
committerandrey <andrey@php.net>
Fri, 29 Jun 2012 11:41:11 +0000 (14:41 +0300)

Trivial merge