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

Trivial merge