]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Sat, 5 Jul 2014 23:21:24 +0000 (01:21 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Sat, 5 Jul 2014 23:21:24 +0000 (01:21 +0200)

Trivial merge