]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Sun, 23 Aug 2015 11:19:31 +0000 (12:19 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sun, 23 Aug 2015 11:19:31 +0000 (12:19 +0100)

Trivial merge