]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Thu, 1 May 2014 09:47:28 +0000 (11:47 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Thu, 1 May 2014 09:47:28 +0000 (11:47 +0200)

Trivial merge