]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Mon, 9 Jun 2014 08:07:36 +0000 (10:07 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Mon, 9 Jun 2014 08:07:36 +0000 (10:07 +0200)

Trivial merge