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

Trivial merge