]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Wed, 25 Jun 2014 11:57:19 +0000 (13:57 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Wed, 25 Jun 2014 11:57:19 +0000 (13:57 +0200)

Trivial merge