]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorPierre Joye <pierre.php@gmail.com>
Wed, 15 May 2013 13:55:13 +0000 (15:55 +0200)
committerPierre Joye <pierre.php@gmail.com>
Wed, 15 May 2013 13:55:13 +0000 (15:55 +0200)

Trivial merge