]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Sun, 2 Mar 2014 19:18:58 +0000 (14:18 -0500)
committerDerick Rethans <github@derickrethans.nl>
Sun, 2 Mar 2014 19:18:58 +0000 (14:18 -0500)

Trivial merge