]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Wed, 2 Jul 2014 15:26:44 +0000 (17:26 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Wed, 2 Jul 2014 15:26:44 +0000 (17:26 +0200)

Trivial merge