]> 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>
Sat, 30 Nov 2013 13:44:08 +0000 (11:44 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:44:08 +0000 (11:44 -0200)

Trivial merge