]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorBob Weinand <bobwei9@hotmail.com>
Mon, 21 Apr 2014 21:32:57 +0000 (23:32 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Mon, 21 Apr 2014 21:32:57 +0000 (23:32 +0200)

Trivial merge