]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' of http://git.php.net/repository/php-src into PHP-5.6
authorBob Weinand <bobwei9@hotmail.com>
Fri, 20 Dec 2013 13:29:35 +0000 (14:29 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Fri, 20 Dec 2013 13:29:35 +0000 (14:29 +0100)

Trivial merge