]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Tue, 28 Oct 2014 16:43:15 +0000 (17:43 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Tue, 28 Oct 2014 16:43:15 +0000 (17:43 +0100)

Trivial merge