]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
authorFelipe Pena <felipensp@gmail.com>
Wed, 1 Jan 2014 11:56:31 +0000 (09:56 -0200)
committerFelipe Pena <felipensp@gmail.com>
Wed, 1 Jan 2014 11:56:31 +0000 (09:56 -0200)

Trivial merge