]> 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>
Tue, 25 Jun 2013 21:01:40 +0000 (18:01 -0300)
committerFelipe Pena <felipensp@gmail.com>
Tue, 25 Jun 2013 21:01:40 +0000 (18:01 -0300)

Trivial merge