]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Tue, 11 Feb 2014 11:31:13 +0000 (11:31 +0000)
committerDerick Rethans <github@derickrethans.nl>
Tue, 11 Feb 2014 11:31:13 +0000 (11:31 +0000)

Trivial merge