]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of http://git.php.net/repository/php-src
authorandrey <andrey@php.net>
Wed, 27 Jun 2012 13:51:35 +0000 (16:51 +0300)
committerandrey <andrey@php.net>
Wed, 27 Jun 2012 13:51:35 +0000 (16:51 +0300)

Trivial merge