]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Thu, 19 Dec 2013 19:01:08 +0000 (19:01 +0000)
committerDerick Rethans <github@derickrethans.nl>
Thu, 19 Dec 2013 19:01:08 +0000 (19:01 +0000)

Trivial merge