]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
authorFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:43:51 +0000 (11:43 -0200)
committerFelipe Pena <felipensp@gmail.com>
Sat, 30 Nov 2013 13:43:51 +0000 (11:43 -0200)

Trivial merge