]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 20:51:15 +0000 (22:51 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 20:51:15 +0000 (22:51 +0200)
* 'master' of git.php.net:/php-src:


Trivial merge